diff --git a/pkg/login/ext_user.go b/pkg/login/ext_user.go
index 05eef3e35dd..763f8b09da6 100644
--- a/pkg/login/ext_user.go
+++ b/pkg/login/ext_user.go
@@ -117,8 +117,8 @@ func updateUser(user *m.User, extUser *m.ExternalUserInfo) error {
 }
 
 func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
+	// don't sync org roles if none are specified
 	if len(extUser.OrgRoles) == 0 {
-		// log.Warn("No group mappings defined")
 		return nil
 	}
 
diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go
index 0da0a460a8b..b452d8e23b7 100644
--- a/pkg/middleware/auth_proxy.go
+++ b/pkg/middleware/auth_proxy.go
@@ -68,6 +68,7 @@ func initContextWithAuthProxy(ctx *m.ReqContext, orgID int64) bool {
 			extUser.Login = proxyHeaderValue
 		} else {
 			ctx.Handle(500, "Auth proxy header property invalid", nil)
+			return true
 		}
 
 		// add/update user in grafana
diff --git a/pkg/services/sqlstore/user_auth.go b/pkg/services/sqlstore/user_auth.go
index 071f003d6ad..6ddccb0da47 100644
--- a/pkg/services/sqlstore/user_auth.go
+++ b/pkg/services/sqlstore/user_auth.go
@@ -15,7 +15,7 @@ func init() {
 }
 
 func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
-	user := new(m.User)
+	user := &m.User{}
 	has := false
 	var err error