diff --git a/pkg/api/login.go b/pkg/api/login.go
index b4c6f8af58e..fbc4cc3d38a 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -47,13 +47,13 @@ func (hs *HTTPServer) LoginView(c *m.ReqContext) {
 	return
 	//}
 
-	if redirectTo, _ := url.QueryUnescape(c.GetCookie("redirect_to")); len(redirectTo) > 0 {
-		c.SetCookie("redirect_to", "", -1, setting.AppSubUrl+"/")
-		c.Redirect(redirectTo)
-		return
-	}
+	// if redirectTo, _ := url.QueryUnescape(c.GetCookie("redirect_to")); len(redirectTo) > 0 {
+	// 	c.SetCookie("redirect_to", "", -1, setting.AppSubUrl+"/")
+	// 	c.Redirect(redirectTo)
+	// 	return
+	// }
 
-	c.Redirect(setting.AppSubUrl + "/")
+	// c.Redirect(setting.AppSubUrl + "/")
 }
 
 func tryOAuthAutoLogin(c *m.ReqContext) bool {
diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go
index fc109ac707f..0b980362447 100644
--- a/pkg/middleware/auth_proxy.go
+++ b/pkg/middleware/auth_proxy.go
@@ -66,7 +66,7 @@ func initContextWithAuthProxy(ctx *m.ReqContext, orgID int64) bool {
 		query.UserId = getRequestUserId(ctx)
 		// if we're using ldap, pass authproxy login name to ldap user sync
 	} else if setting.LdapEnabled {
-		ctx.Session.Delete(session.SESS_KEY_LASTLDAPSYNC)
+		ctx.Session.Delete(session.SESS_KEY_LASTLDAPSYNC) //makes sure we always sync with ldap if session if we only have last sync info in session but not user.
 
 		syncQuery := &m.LoginUserQuery{
 			ReqContext: ctx,
diff --git a/pkg/services/auth/auth_token_test.go b/pkg/services/auth/auth_token_test.go
index ee9bdf60bb9..a34dbc673e6 100644
--- a/pkg/services/auth/auth_token_test.go
+++ b/pkg/services/auth/auth_token_test.go
@@ -291,7 +291,14 @@ func createTestContext(t *testing.T) *testContext {
 	sqlstore := sqlstore.InitTestDB(t)
 	tokenService := &UserAuthTokenServiceImpl{
 		SQLStore: sqlstore,
-		log:      log.New("test-logger"),
+		Cfg: &setting.Cfg{
+			LoginCookieName:                   "grafana_session",
+			LoginCookieUsername:               "grafana_username",
+			LoginCookieSecure:                 false,
+			LoginCookieMaxDays:                7,
+			LoginDeleteExpiredTokensAfterDays: 30,
+		},
+		log: log.New("test-logger"),
 	}
 
 	RotateTime = 10 * time.Minute