diff --git a/pkg/services/login/login.go b/pkg/services/login/login.go
index fa18ebc8c00..83e8dfc9845 100644
--- a/pkg/services/login/login.go
+++ b/pkg/services/login/login.go
@@ -42,7 +42,7 @@ func (ls *LoginService) UpsertUser(cmd *models.UpsertUserCommand) error {
 	}
 
 	if err := bus.Dispatch(userQuery); err != nil {
-		if err != models.ErrUserNotFound {
+		if !errors.Is(err, models.ErrUserNotFound) {
 			return err
 		}
 		if !cmd.SignupAllowed {
@@ -114,7 +114,7 @@ func (ls *LoginService) UpsertUser(cmd *models.UpsertUserCommand) error {
 		User:         cmd.Result,
 		ExternalUser: extUser,
 	})
-	if err != nil && err != bus.ErrHandlerNotFound {
+	if err != nil && !errors.Is(err, bus.ErrHandlerNotFound) {
 		return err
 	}
 
@@ -223,7 +223,7 @@ func syncOrgRoles(user *models.User, extUser *models.ExternalUserInfo) error {
 		// add role
 		cmd := &models.AddOrgUserCommand{UserId: user.Id, Role: orgRole, OrgId: orgId}
 		err := bus.Dispatch(cmd)
-		if err != nil && err != models.ErrOrgNotFound {
+		if err != nil && !errors.Is(err, models.ErrOrgNotFound) {
 			return err
 		}
 	}