diff --git a/src/MusicStore.Spa/Models/IdentityModels.cs b/src/MusicStore.Spa/Models/IdentityModels.cs
index 2eb30a164f..23d88fef88 100644
--- a/src/MusicStore.Spa/Models/IdentityModels.cs
+++ b/src/MusicStore.Spa/Models/IdentityModels.cs
@@ -1,11 +1,12 @@
 using System;
+using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.Data.Entity;
 using Microsoft.Framework.OptionsModel;
 
 namespace MusicStore.Models
 {
-    public class ApplicationUser : User { }
+    public class ApplicationUser : IdentityUser { }
 
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser> 
     {
diff --git a/src/MusicStore.Spa/Startup.cs b/src/MusicStore.Spa/Startup.cs
index 706b2648f7..641d0c11f3 100644
--- a/src/MusicStore.Spa/Startup.cs
+++ b/src/MusicStore.Spa/Startup.cs
@@ -43,8 +43,7 @@ namespace MusicStore.Spa
                     .AddSqlServer();
 
                 // Add Identity services to the service container
-                services.AddIdentity<ApplicationUser>()
-                    .AddEntityFramework<ApplicationUser, ApplicationDbContext>()
+                services.AddIdentitySqlServer<ApplicationDbContext, ApplicationUser>()
                     .AddHttpSignIn();
 
                 // Add application services to the service container
diff --git a/src/MusicStore/Models/IdentityModels.cs b/src/MusicStore/Models/IdentityModels.cs
index 592d0e2b1c..51a1ce6c0a 100644
--- a/src/MusicStore/Models/IdentityModels.cs
+++ b/src/MusicStore/Models/IdentityModels.cs
@@ -1,11 +1,12 @@
 using System;
+using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.Data.Entity;
 using Microsoft.Framework.OptionsModel;
 
 namespace MusicStore.Models
 {
-    public class ApplicationUser : User { }
+    public class ApplicationUser : IdentityUser { }
 
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {
diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs
index d92d34c1b3..5d179ef6a1 100644
--- a/src/MusicStore/Startup.cs
+++ b/src/MusicStore/Startup.cs
@@ -44,8 +44,7 @@ namespace MusicStore
                     options.UseSqlServer(configuration.Get("Data:DefaultConnection:ConnectionString")));
 
                 // Add Identity services to the services container
-                services.AddIdentity<ApplicationUser>()
-                        .AddEntityFramework<ApplicationUser, ApplicationDbContext>()
+                services.AddIdentitySqlServer<ApplicationDbContext, ApplicationUser>()
                         .AddHttpSignIn();
 
                 // Add MVC services to the services container