diff --git a/src/MusicStore/Models/IdentityModels.cs b/src/MusicStore/Models/IdentityModels.cs
index dcc779d1d8..ba6183bf1e 100644
--- a/src/MusicStore/Models/IdentityModels.cs
+++ b/src/MusicStore/Models/IdentityModels.cs
@@ -9,9 +9,18 @@ namespace MusicStore.Models
 
     public class ApplicationDbContext : IdentitySqlContext<ApplicationUser>
     {
+        private IdentityDbContextOptions options;
+
         public ApplicationDbContext(IServiceProvider serviceProvider, IOptionsAccessor<IdentityDbContextOptions> optionsAccessor)
                    : base(serviceProvider, optionsAccessor.Options)
         {
+            options = optionsAccessor.Options;
+        }
+
+        protected override void OnConfiguring(DbContextOptions builder)
+        {
+            //Bug: Identity overriding the passed in connection string with a default value. https://github.com/aspnet/identity/issues/102
+            builder.UseSqlServer(options.ConnectionString);
         }
     }
 
@@ -20,5 +29,8 @@ namespace MusicStore.Models
         public string DefaultAdminUserName { get; set; }
 
         public string DefaultAdminPassword { get; set; }
+
+        //Bug: Identity overriding the passed in connection string with a default value. https://github.com/aspnet/identity/issues/102
+        public string ConnectionString { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs
index 9fa98cc65e..aa64eda4d2 100644
--- a/src/MusicStore/Startup.cs
+++ b/src/MusicStore/Startup.cs
@@ -40,7 +40,9 @@ namespace MusicStore
                         {
                             options.DefaultAdminUserName = configuration.Get("DefaultAdminUsername");
                             options.DefaultAdminPassword = configuration.Get("DefaultAdminPassword");
-                            options.UseSqlServer(configuration.Get("Data:IdentityConnection:ConnectionString"));
+                            //Bug: Identity overriding the passed in connection string with a default value. https://github.com/aspnet/identity/issues/102
+                            options.ConnectionString = configuration.Get("Data:IdentityConnection:ConnectionString");
+                            options.UseSqlServer(options.ConnectionString);
                         });
 
                 services.SetupOptions<MusicStoreDbContextOptions>(options =>