diff --git a/samples/IdentitySample.Mvc/Startup.cs b/samples/IdentitySample.Mvc/Startup.cs
index 916969aa4e..6b5351727f 100644
--- a/samples/IdentitySample.Mvc/Startup.cs
+++ b/samples/IdentitySample.Mvc/Startup.cs
@@ -115,7 +115,7 @@ namespace IdentitySamples
                     options.Password.RequireLowercase = false;
                     options.Password.RequireUppercase = false;
                     options.Password.RequireNonLetterOrDigit = false;
-                    options.SecurityStampValidationInterval = TimeSpan.Zero;
+                    options.SecurityStampValidationInterval = TimeSpan.FromMinutes(1);
                 });
                 services.SetupOptions<GoogleAuthenticationOptions>(options =>
                 {
diff --git a/src/Microsoft.AspNet.Identity/SignInManager.cs b/src/Microsoft.AspNet.Identity/SignInManager.cs
index 5aa7521ab2..2920a2799a 100644
--- a/src/Microsoft.AspNet.Identity/SignInManager.cs
+++ b/src/Microsoft.AspNet.Identity/SignInManager.cs
@@ -74,8 +74,9 @@ namespace Microsoft.AspNet.Identity
             CancellationToken cancellationToken = default(CancellationToken))
         {
             var userIdentity = await CreateUserIdentityAsync(user);
-            // Always clear any external login cookies when signing in for real
-            Context.Response.SignOut(Options.ExternalCookie.AuthenticationType);
+            // Should always clear any external login cookies when signing in for real
+            // BUG: SignOut currently throws if auth type was not signed in
+            //Context.Response.SignOut(Options.ExternalCookie.AuthenticationType);
             if (authenticationMethod != null)
             {
                 userIdentity.AddClaim(new Claim(ClaimTypes.AuthenticationMethod, authenticationMethod));