diff --git a/src/Microsoft.AspNet.Identity.Entity/IdentityBuilderExtensions.cs b/src/Microsoft.AspNet.Identity.Entity/IdentityBuilderExtensions.cs
index 39742db126..66be171033 100644
--- a/src/Microsoft.AspNet.Identity.Entity/IdentityBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Identity.Entity/IdentityBuilderExtensions.cs
@@ -26,6 +26,7 @@ namespace Microsoft.AspNet.Identity
             return builder;
         }
 
+        // todo: remove
         public static IdentityBuilder<TUser, IdentityRole> AddEntity<TUser, TContext>(this IdentityBuilder<TUser, IdentityRole> builder)
             where TUser : User where TContext : DbContext
         {
@@ -35,5 +36,14 @@ namespace Microsoft.AspNet.Identity
             return builder;
         }
 
+        // todo: add overloads
+        public static IdentityBuilder<TUser, IdentityRole> AddEntityFramework<TUser, TContext>(this IdentityBuilder<TUser, IdentityRole> builder)
+            where TUser : User where TContext : DbContext
+        {
+            builder.Services.AddScoped<IUserStore<TUser>, UserStore<TUser, TContext>>();
+            builder.Services.AddScoped<UserManager<TUser>>();
+            builder.Services.AddScoped<TContext>();
+            return builder;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Identity.Security/IdentityBuilderExtensions.cs b/src/Microsoft.AspNet.Identity.Security/IdentityBuilderExtensions.cs
index 18a5ec82c2..ca3d891513 100644
--- a/src/Microsoft.AspNet.Identity.Security/IdentityBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Identity.Security/IdentityBuilderExtensions.cs
@@ -8,11 +8,19 @@ namespace Microsoft.AspNet.Identity
 {
     public static class IdentityBuilderExtensions
     {
+        // TODO: remove
         public static IdentityBuilder<TUser, IdentityRole> AddSecurity<TUser>(this IdentityBuilder<TUser, IdentityRole> builder)
             where TUser : class
         {
             builder.Services.AddScoped<SignInManager<TUser>>();
             return builder;
         }
+
+        public static IdentityBuilder<TUser, IdentityRole> AddHttpSignIn<TUser>(this IdentityBuilder<TUser, IdentityRole> builder)
+            where TUser : class
+        {
+            builder.Services.AddScoped<SignInManager<TUser>>();
+            return builder;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Identity.Security/SecurityServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Identity.Security/SecurityServiceCollectionExtensions.cs
index 82a7bce310..951d88a75b 100644
--- a/src/Microsoft.AspNet.Identity.Security/SecurityServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNet.Identity.Security/SecurityServiceCollectionExtensions.cs
@@ -7,6 +7,7 @@ namespace Microsoft.Framework.DependencyInjection
 {
     public static class SecurityServiceCollectionExtensions
     {
+        // todo: remove?
         public static ServiceCollection AddSecurity<TUser>(this ServiceCollection services)
             where TUser : class
         {
diff --git a/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs b/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs
index 36c7a179ac..c93ad2c717 100644
--- a/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs
+++ b/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs
@@ -48,7 +48,7 @@ namespace Microsoft.AspNet.Identity.Security.Test
                 services.AddIdentity<ApplicationUser, IdentityRole>(s =>
                 {
                     s.AddInMemory();
-                }).AddSecurity<ApplicationUser>();
+                }).AddHttpSignIn<ApplicationUser>();
             });
 
             // Act