diff --git a/system/service/user.go b/system/service/user.go
index 9a758d141..fa595c90e 100644
--- a/system/service/user.go
+++ b/system/service/user.go
@@ -238,6 +238,10 @@ func (svc user) FindByAny(identifier interface{}) (u *types.User, err error) {
 
 func (svc user) proc(u *types.User, err error) (*types.User, error) {
 	if err != nil {
+		if repository.ErrUserNotFound.Eq(err) {
+			return nil, UserErrNonexistent()
+		}
+
 		return nil, err
 	}