diff --git a/Server/Migrations/Sqlite/20200305230311_Initial.Designer.cs b/Server/Migrations/Sqlite/20200305230311_Initial.Designer.cs
index 5148dc064..87eb0b347 100644
--- a/Server/Migrations/Sqlite/20200305230311_Initial.Designer.cs
+++ b/Server/Migrations/Sqlite/20200305230311_Initial.Designer.cs
@@ -8,7 +8,7 @@
 
 namespace Remotely.Server.Migrations.Sqlite
 {
-    [DbContext(typeof(ApplicationDbContext))]
+    [DbContext(typeof(SqliteDbContext))]
     [Migration("20200305230311_Initial")]
     partial class Initial
     {
diff --git a/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.Designer.cs b/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.Designer.cs
index e8dc05906..de6274d49 100644
--- a/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.Designer.cs	
+++ b/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.Designer.cs	
@@ -6,9 +6,9 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Remotely.Server.Data;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
-    [DbContext(typeof(ApplicationDbContext))]
+    [DbContext(typeof(SqliteDbContext))]
     [Migration("20200306013915_IsServerAdmin property")]
     partial class IsServerAdminproperty
     {
diff --git a/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.cs b/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.cs
index 2482c9cdf..48d458c87 100644
--- a/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.cs	
+++ b/Server/Migrations/Sqlite/20200306013915_IsServerAdmin property.cs	
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class IsServerAdminproperty : Migration
     {
diff --git a/Server/Migrations/Sqlite/20200325145606_Alerts.Designer.cs b/Server/Migrations/Sqlite/20200325145606_Alerts.Designer.cs
index de88e810a..bbc1b8917 100644
--- a/Server/Migrations/Sqlite/20200325145606_Alerts.Designer.cs
+++ b/Server/Migrations/Sqlite/20200325145606_Alerts.Designer.cs
@@ -6,9 +6,9 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Remotely.Server.Data;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
-    [DbContext(typeof(ApplicationDbContext))]
+    [DbContext(typeof(SqliteDbContext))]
     [Migration("20200325145606_Alerts")]
     partial class Alerts
     {
diff --git a/Server/Migrations/Sqlite/20200325145606_Alerts.cs b/Server/Migrations/Sqlite/20200325145606_Alerts.cs
index 569b8f68f..cade96b3d 100644
--- a/Server/Migrations/Sqlite/20200325145606_Alerts.cs
+++ b/Server/Migrations/Sqlite/20200325145606_Alerts.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class Alerts : Migration
     {
diff --git a/Server/Migrations/Sqlite/20200327034430_Device Notes.Designer.cs b/Server/Migrations/Sqlite/20200327034430_Device Notes.Designer.cs
index 49ca39a2b..308e27301 100644
--- a/Server/Migrations/Sqlite/20200327034430_Device Notes.Designer.cs	
+++ b/Server/Migrations/Sqlite/20200327034430_Device Notes.Designer.cs	
@@ -6,9 +6,9 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Remotely.Server.Data;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
-    [DbContext(typeof(ApplicationDbContext))]
+    [DbContext(typeof(SqliteDbContext))]
     [Migration("20200327034430_Device Notes")]
     partial class DeviceNotes
     {
diff --git a/Server/Migrations/Sqlite/20200327034430_Device Notes.cs b/Server/Migrations/Sqlite/20200327034430_Device Notes.cs
index 5d7412476..1a12fe4ae 100644
--- a/Server/Migrations/Sqlite/20200327034430_Device Notes.cs	
+++ b/Server/Migrations/Sqlite/20200327034430_Device Notes.cs	
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class DeviceNotes : Migration
     {
diff --git a/Server/Migrations/Sqlite/20200425052143_PublicIP.Designer.cs b/Server/Migrations/Sqlite/20200425052143_PublicIP.Designer.cs
index d7ad7953c..b825e51ea 100644
--- a/Server/Migrations/Sqlite/20200425052143_PublicIP.Designer.cs
+++ b/Server/Migrations/Sqlite/20200425052143_PublicIP.Designer.cs
@@ -6,9 +6,9 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Remotely.Server.Data;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
-    [DbContext(typeof(ApplicationDbContext))]
+    [DbContext(typeof(SqliteDbContext))]
     [Migration("20200425052143_PublicIP")]
     partial class PublicIP
     {
diff --git a/Server/Migrations/Sqlite/20200425052143_PublicIP.cs b/Server/Migrations/Sqlite/20200425052143_PublicIP.cs
index ada5b1e34..79d2b9d75 100644
--- a/Server/Migrations/Sqlite/20200425052143_PublicIP.cs
+++ b/Server/Migrations/Sqlite/20200425052143_PublicIP.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class PublicIP : Migration
     {
diff --git a/Server/Migrations/Sqlite/20200430222500_DisplayName.Designer.cs b/Server/Migrations/Sqlite/20200430222500_DisplayName.Designer.cs
index 5cccfcc2d..9df6d305d 100644
--- a/Server/Migrations/Sqlite/20200430222500_DisplayName.Designer.cs
+++ b/Server/Migrations/Sqlite/20200430222500_DisplayName.Designer.cs
@@ -6,9 +6,9 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Remotely.Server.Data;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
-    [DbContext(typeof(ApplicationDbContext))]
+    [DbContext(typeof(SqliteDbContext))]
     [Migration("20200430222500_DisplayName")]
     partial class DisplayName
     {
diff --git a/Server/Migrations/Sqlite/20200430222500_DisplayName.cs b/Server/Migrations/Sqlite/20200430222500_DisplayName.cs
index 10534233e..39b66ed48 100644
--- a/Server/Migrations/Sqlite/20200430222500_DisplayName.cs
+++ b/Server/Migrations/Sqlite/20200430222500_DisplayName.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class DisplayName : Migration
     {
diff --git a/Server/Migrations/Sqlite/20200717143837_Temp password.Designer.cs b/Server/Migrations/Sqlite/20200717143837_Temp password.Designer.cs
index ea58ce1ce..a43664bc1 100644
--- a/Server/Migrations/Sqlite/20200717143837_Temp password.Designer.cs	
+++ b/Server/Migrations/Sqlite/20200717143837_Temp password.Designer.cs	
@@ -6,9 +6,9 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Remotely.Server.Data;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
-    [DbContext(typeof(ApplicationDbContext))]
+    [DbContext(typeof(SqliteDbContext))]
     [Migration("20200717143837_Temp password")]
     partial class Temppassword
     {
diff --git a/Server/Migrations/Sqlite/20200717143837_Temp password.cs b/Server/Migrations/Sqlite/20200717143837_Temp password.cs
index 3446a9ad0..916f4f730 100644
--- a/Server/Migrations/Sqlite/20200717143837_Temp password.cs	
+++ b/Server/Migrations/Sqlite/20200717143837_Temp password.cs	
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     public partial class Temppassword : Migration
     {
diff --git a/Server/Migrations/Sqlite/SqliteDbContextModelSnapshot.cs b/Server/Migrations/Sqlite/SqliteDbContextModelSnapshot.cs
index a2c35e941..75450a59b 100644
--- a/Server/Migrations/Sqlite/SqliteDbContextModelSnapshot.cs
+++ b/Server/Migrations/Sqlite/SqliteDbContextModelSnapshot.cs
@@ -5,7 +5,7 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Remotely.Server.Data;
 
-namespace Remotely.Server.Migrations
+namespace Remotely.Server.Migrations.Sqlite
 {
     [DbContext(typeof(SqliteDbContext))]
     partial class SqliteDbContextModelSnapshot : ModelSnapshot
@@ -14,7 +14,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "3.1.5");
+                .HasAnnotation("ProductVersion", "3.1.7");
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
                 {
diff --git a/Server/Server.csproj b/Server/Server.csproj
index 5fa7dbb5f..b302d7ee6 100644
--- a/Server/Server.csproj
+++ b/Server/Server.csproj
@@ -87,6 +87,7 @@
 
   <ItemGroup>
     <Folder Include="Migrations\PostgreSql\" />
+    <Folder Include="Migrations\Sqlite\" />
     <Folder Include="Properties\" />
   </ItemGroup>
 
diff --git a/Server/Startup.cs b/Server/Startup.cs
index d2f9c05c7..db44d30ec 100644
--- a/Server/Startup.cs
+++ b/Server/Startup.cs
@@ -45,22 +45,11 @@ public void ConfigureServices(IServiceCollection services)
             {
                 services.AddDbContext<ApplicationDbContext, SqliteDbContext>(options => 
                     options.UseSqlite(Configuration.GetConnectionString("SQLite")));
-
-                services.AddIdentity<RemotelyUser, IdentityRole>(options => options.Stores.MaxLengthForKeys = 128)
-                   .AddEntityFrameworkStores<ApplicationDbContext>()
-                   .AddDefaultUI()
-                   .AddDefaultTokenProviders();
             }
             else if (dbProvider == "sqlserver")
             {
                 services.AddDbContext<ApplicationDbContext, SqlServerDbContext>(options =>
                     options.UseSqlServer(Configuration.GetConnectionString("SQLServer")));
-                     
-
-                services.AddIdentity<RemotelyUser, IdentityRole>(options => options.Stores.MaxLengthForKeys = 128)
-                    .AddEntityFrameworkStores<ApplicationDbContext>()
-                    .AddDefaultUI()
-                    .AddDefaultTokenProviders();
             }
             else if (dbProvider == "postgresql")
             {
@@ -81,13 +70,13 @@ public void ConfigureServices(IServiceCollection services)
                         options.UseNpgsql(Configuration.GetConnectionString("PostgreSQL"));
                     }
                 });
-
-                services.AddIdentity<RemotelyUser, IdentityRole>(options => options.Stores.MaxLengthForKeys = 128)
-                    .AddEntityFrameworkStores<ApplicationDbContext>()
-                    .AddDefaultUI()
-                    .AddDefaultTokenProviders();
             }
 
+            services.AddIdentity<RemotelyUser, IdentityRole>(options => options.Stores.MaxLengthForKeys = 128)
+                .AddEntityFrameworkStores<ApplicationDbContext>()
+                .AddDefaultUI()
+                .AddDefaultTokenProviders();
+
             var trustedOrigins = Configuration.GetSection("ApplicationOptions:TrustedCorsOrigins").Get<string[]>();
 
             if (trustedOrigins != null)