diff --git a/pkg/keystone/models/users.go b/pkg/keystone/models/users.go
index c511056658..32f1a33ae8 100644
--- a/pkg/keystone/models/users.go
+++ b/pkg/keystone/models/users.go
@@ -299,10 +299,10 @@ func VerifyPassword(user *api.SUserExtended, passwd string) error {
 func localUserVerifyPassword(user *api.SUserExtended, passwd string) error {
 	passes, err := PasswordManager.fetchByLocaluserId(user.LocalId)
 	if err != nil {
-		return err
+		return errors.Wrap(err, "fetchPassword")
 	}
 	if len(passes) == 0 {
-		return nil
+		return errors.Error("no valid password")
 	}
 	// password expiration check skip system account
 	if passes[0].IsExpired() && !user.IsSystemAccount {