diff --git a/Yavsc.Server/Constants.cs b/Yavsc.Server/Constants.cs
index c44998f6..622e0241 100644
--- a/Yavsc.Server/Constants.cs
+++ b/Yavsc.Server/Constants.cs
@@ -29,7 +29,8 @@ namespace Yavsc
             AvatarsPath = "/avatars",
             GitPath = "/sources",
             DefaultAvatar = "/images/Users/icon_user.png",
-            AnonAvatar = "/images/Users/icon_anon_user.png";
+            AnonAvatar = "/images/Users/icon_anon_user.png",
+            YavscConnectionStringEnvName = "YAVSC_DB_CONNECTION";
         
         public static readonly long DefaultFSQ = 1024*1024*500;
 
diff --git a/Yavsc/Models/ApplicationDbContext.cs b/Yavsc/Models/ApplicationDbContext.cs
index 9d653f76..7560043e 100644
--- a/Yavsc/Models/ApplicationDbContext.cs
+++ b/Yavsc/Models/ApplicationDbContext.cs
@@ -71,7 +71,8 @@ namespace Yavsc.Models
         }
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            optionsBuilder.UseNpgsql((string) AppDomain.CurrentDomain.GetData("YAVSC_CONNECTION"));
+            var appSetup = (string)AppDomain.CurrentDomain.GetData(Constants.YavscConnectionStringEnvName);
+            if (appSetup!=null) optionsBuilder.UseNpgsql(appSetup);
         }
 
         public DbSet<Client> Applications { get; set; }
diff --git a/Yavsc/Startup/Startup.cs b/Yavsc/Startup/Startup.cs
index 362b900f..15849975 100755
--- a/Yavsc/Startup/Startup.cs
+++ b/Yavsc/Startup/Startup.cs
@@ -78,7 +78,7 @@ namespace Yavsc
             var auth = Configuration["Site:Authority"];
             var cxstr = Configuration["Data:DefaultConnection:ConnectionString"];
             ConnectionString = cxstr;
-            AppDomain.CurrentDomain.SetData("YAVSC_CONNECTION", ConnectionString);
+            AppDomain.CurrentDomain.SetData(Constants.YavscConnectionStringEnvName, ConnectionString);
         }
         public static string ConnectionString { get; set; }
         public static GoogleAuthSettings GoogleSettings { get; set; }
diff --git a/cli/appsettings.json b/cli/appsettings.json
index 0142170d..682807de 100644
--- a/cli/appsettings.json
+++ b/cli/appsettings.json
@@ -15,5 +15,10 @@
             "System": "Warning",
             "Microsoft": "Warning"
         }
+    },
+    "Data": {
+      "DefaultConnection": {
+        "ConnectionString": "Server=localhost;Port=5432;Database=YavscDev;Username=yavscdev;Password=admin;"
+      }
     }
-}
\ No newline at end of file
+}
diff --git a/cli/project.json b/cli/project.json
index e5c6167c..d93f16fb 100644
--- a/cli/project.json
+++ b/cli/project.json
@@ -1,56 +1,65 @@
-{
-    "version": "1.0.5-*",
-    "commands": {
-        "run": "run"
+{
+  "version": "1.0.5-*",
+  "commands": {
+    "run": "run"
+  },
+  "resource": "Resources/**/*.resx",
+  "buildOptions": {
+    "debugType": "full",
+    "emitEntryPoint": true,
+    "compile": {
+      "include": "*.cs",
+      "exclude": [
+        "contrib"
+      ]
     },
-    "resource": "Resources/**/*.resx",
-    "buildOptions": {
-        "debugType": "full",
-        "emitEntryPoint": true,
-        "compile": {
-            "include": "*.cs",
-            "exclude": [
-                "contrib"
-            ]
-        },
-        "embed": [
-            "Resources/**/*.resx"
-        ]
+    "embed": [
+      "Resources/**/*.resx"
+    ]
+  },
+  "dependencies": {
+    "EntityFramework7.Npgsql": "3.1.0-rc1-3",
+    "MailKit": "1.12.0",
+    "Microsoft.AspNet.Hosting": "1.0.0-rc1-final",
+    "Microsoft.AspNet.Identity": "3.0.0-rc1-*",
+    "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*",
+    "Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
+    "Microsoft.CodeAnalysis": "1.1.0-rc1-20151109-01",
+    "Microsoft.Extensions.CodeGeneration": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Localization": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Options": "0.0.1-alpha",
+    "Microsoft.Extensions.WebEncoders": "1.0.0-rc1-final",
+    "Microsoft.Extensions.WebEncoders.Core": "1.0.0-rc1-final",
+    "Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
+    "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
+    "Newtonsoft.Json": "9.0.1",
+    "Yavsc": {
+      "version": "1.0.5-rc21-beta5",
+      "target": "package"
     },
-    "dependencies": {
-        "EntityFramework7.Npgsql": "3.1.0-rc1-3",
-        "MailKit": "1.12.0",
-        "Microsoft.AspNet.Hosting": "1.0.0-rc1-final",
-        "Microsoft.AspNet.Identity": "3.0.0-rc1-*",
-        "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*",
-        "Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
-        "Microsoft.CodeAnalysis": "1.1.0-rc1-20151109-01",
-        "Microsoft.Extensions.CodeGeneration": "1.0.0-rc1-final",
-        "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final",
-        "Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final",
-        "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final",
-        "Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final",
-        "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
-        "Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final",
-        "Microsoft.Extensions.Localization": "1.0.0-rc1-final",
-        "Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final",
-        "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
-        "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
-        "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
-        "Microsoft.Extensions.Logging.TraceSource": "1.0.0-rc1-final",
-        "Microsoft.Extensions.Options": "0.0.1-alpha",
-        "Microsoft.Extensions.WebEncoders": "1.0.0-rc1-final",
-        "Microsoft.Extensions.WebEncoders.Core": "1.0.0-rc1-final",
-        "Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
-        "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
-        "Newtonsoft.Json": "9.0.1",
-        "Yavsc": { "version": "1.0.5-rc21-beta4", "target": "package" },
-        "Yavsc.Abstract": { "version": "1.0.5-rc21-beta4", "target": "package" },
-        "Yavsc.Server": { "version": "1.0.5-rc21-beta4", "target": "package" }
+    "Yavsc.Abstract": {
+      "version": "1.0.5-rc21-beta5",
+      "target": "package"
     },
-    "frameworks": {
-        "dnx451": {
-            "System.Net": "4.0.0"
-        }
+    "Yavsc.Server": {
+      "version": "1.0.5-rc21-beta5",
+      "target": "package"
+    },
+    "Yavsc.Lib.Portable": "1.0.2"
+  },
+  "frameworks": {
+    "dnx451": {
+      "System.Net": "4.0.0"
     }
+  }
 }
diff --git a/rc-num.txt b/rc-num.txt
index d818f966..244338cc 100644
--- a/rc-num.txt
+++ b/rc-num.txt
@@ -1 +1 @@
-21-beta4
+21-beta5