diff --git a/services/auth/basic.go b/services/auth/basic.go
index 5fb80703ab5a4..3f2d769bff6b9 100644
--- a/services/auth/basic.go
+++ b/services/auth/basic.go
@@ -113,8 +113,9 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore
 	if err != nil {
 		if !user_model.IsErrUserNotExist(err) {
 			log.Error("UserSignIn: %v", err)
+			return nil, err
 		}
-		return nil, err
+		return nil, nil
 	}
 
 	if skipper, ok := source.Cfg.(LocalTwoFASkipper); ok && skipper.IsSkipLocalTwoFA() {
diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go
index c0a8250e95472..9de46fb829ff9 100644
--- a/services/auth/oauth2.go
+++ b/services/auth/oauth2.go
@@ -123,8 +123,9 @@ func (o *OAuth2) Verify(req *http.Request, w http.ResponseWriter, store DataStor
 	if err != nil {
 		if !user_model.IsErrUserNotExist(err) {
 			log.Error("GetUserByName: %v", err)
+			return nil, err
 		}
-		return nil, err
+		return nil, nil
 	}
 
 	log.Trace("OAuth2 Authorization: Logged in user %-v", user)
diff --git a/services/auth/reverseproxy.go b/services/auth/reverseproxy.go
index 0206ccdf667df..676aba254c4a4 100644
--- a/services/auth/reverseproxy.go
+++ b/services/auth/reverseproxy.go
@@ -60,10 +60,13 @@ func (r *ReverseProxy) getUserFromAuthUser(req *http.Request) (*user_model.User,
 
 	user, err := user_model.GetUserByName(req.Context(), username)
 	if err != nil {
-		if !user_model.IsErrUserNotExist(err) || !r.isAutoRegisterAllowed() {
+		if !user_model.IsErrUserNotExist(err) {
 			log.Error("GetUserByName: %v", err)
 			return nil, err
 		}
+		if !r.isAutoRegisterAllowed() {
+			return nil, nil
+		}
 		user = r.newUser(req)
 	}
 	return user, nil