diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs
index 74bbeeaf16..642dd69dab 100644
--- a/src/MusicStore/Startup.cs
+++ b/src/MusicStore/Startup.cs
@@ -41,7 +41,8 @@ namespace MusicStore
             {
                 services.AddEntityFramework()
                         .AddSqlServer()
-                        .AddDbContext<MusicStoreContext>();
+                        .AddDbContext<MusicStoreContext>(options =>
+                            options.UserSqlServer(Configuration.Get("Data:DefaultConnection:ConnectionString")));
             }
 
             // Add Identity services to the services container
diff --git a/src/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/StartupNtlmAuthentication.cs
index c06455971d..0ee62d45fb 100644
--- a/src/MusicStore/StartupNtlmAuthentication.cs
+++ b/src/MusicStore/StartupNtlmAuthentication.cs
@@ -46,7 +46,8 @@ namespace MusicStore
             // Add EF services to the services container
             services.AddEntityFramework()
                     .AddSqlServer()
-                    .AddDbContext<MusicStoreContext>();
+                    .AddDbContext<MusicStoreContext>(options =>
+                            options.UserSqlServer(Configuration.Get("Data:DefaultConnection:ConnectionString")));
 
             // Add MVC services to the services container
             services.AddMvc();
diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs
index f575d83706..b4dc38e85a 100644
--- a/src/MusicStore/StartupOpenIdConnect.cs
+++ b/src/MusicStore/StartupOpenIdConnect.cs
@@ -54,7 +54,8 @@ namespace MusicStore
             {
                 services.AddEntityFramework()
                         .AddSqlServer()
-                        .AddDbContext<MusicStoreContext>();
+                        .AddDbContext<MusicStoreContext>(options =>
+                            options.UserSqlServer(Configuration.Get("Data:DefaultConnection:ConnectionString")));
             }
 
             // Add Identity services to the services container
diff --git a/src/MusicStore/config.json b/src/MusicStore/config.json
index 795bb0c880..888b773ddb 100644
--- a/src/MusicStore/config.json
+++ b/src/MusicStore/config.json
@@ -7,10 +7,5 @@
             // "Server=(localdb)\\.\\IIS_DB;Database=MusicStore;Trusted_Connection=False;MultipleActiveResultSets=true;User ID=iis_login;Password=********"
             "Connectionstring": "Server=(localdb)\\MSSQLLocalDB;Database=MusicStore;Trusted_Connection=True;MultipleActiveResultSets=true"
         }
-    },
-    "EntityFramework": {
-        "MusicStoreContext": {
-            "ConnectionString": "Name=Data:DefaultConnection:ConnectionString"
-        }
     }
 }
\ No newline at end of file