diff --git a/services/auth/source/ldap/source_authenticate.go b/services/auth/source/ldap/source_authenticate.go
index 6005a4744ae..4463bcc0544 100644
--- a/services/auth/source/ldap/source_authenticate.go
+++ b/services/auth/source/ldap/source_authenticate.go
@@ -105,9 +105,7 @@ func (source *Source) Authenticate(ctx context.Context, user *user_model.User, u
 			}
 		}
 		if source.AttributeAvatar != "" {
-			if err := user_service.UploadAvatar(ctx, user, sr.Avatar); err != nil {
-				return user, err
-			}
+			_ = user_service.UploadAvatar(ctx, user, sr.Avatar)
 		}
 	}
 
diff --git a/services/repository/avatar.go b/services/repository/avatar.go
index 79da629aa66..7ab6badfc34 100644
--- a/services/repository/avatar.go
+++ b/services/repository/avatar.go
@@ -21,7 +21,7 @@ import (
 func UploadAvatar(ctx context.Context, repo *repo_model.Repository, data []byte) error {
 	avatarData, err := avatar.ProcessAvatarImage(data)
 	if err != nil {
-		return err
+		return fmt.Errorf("UploadAvatar: failed to process repo avatar image: %w", err)
 	}
 
 	newAvatar := avatar.HashAvatar(repo.ID, data)
@@ -36,19 +36,19 @@ func UploadAvatar(ctx context.Context, repo *repo_model.Repository, data []byte)
 		// Then repo will be removed - only it avatar file will be removed
 		repo.Avatar = newAvatar
 		if err := repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "avatar"); err != nil {
-			return fmt.Errorf("UploadAvatar: Update repository avatar: %w", err)
+			return fmt.Errorf("UploadAvatar: failed to update repository avatar: %w", err)
 		}
 
 		if err := storage.SaveFrom(storage.RepoAvatars, repo.CustomAvatarRelativePath(), func(w io.Writer) error {
 			_, err := w.Write(avatarData)
 			return err
 		}); err != nil {
-			return fmt.Errorf("UploadAvatar %s failed: Failed to remove old repo avatar %s: %w", repo.RelativePath(), newAvatar, err)
+			return fmt.Errorf("UploadAvatar: failed to save repo avatar %s: %w", newAvatar, err)
 		}
 
 		if len(oldAvatarPath) > 0 {
 			if err := storage.RepoAvatars.Delete(oldAvatarPath); err != nil {
-				return fmt.Errorf("UploadAvatar: Failed to remove old repo avatar %s: %w", oldAvatarPath, err)
+				return fmt.Errorf("UploadAvatar: failed to remove old repo avatar %s: %w", oldAvatarPath, err)
 			}
 		}
 		return nil
diff --git a/services/user/avatar.go b/services/user/avatar.go
index df188e5adc4..6a43681e9e8 100644
--- a/services/user/avatar.go
+++ b/services/user/avatar.go
@@ -21,21 +21,21 @@ import (
 func UploadAvatar(ctx context.Context, u *user_model.User, data []byte) error {
 	avatarData, err := avatar.ProcessAvatarImage(data)
 	if err != nil {
-		return err
+		return fmt.Errorf("UploadAvatar: failed to process user avatar image: %w", err)
 	}
 
 	return db.WithTx(ctx, func(ctx context.Context) error {
 		u.UseCustomAvatar = true
 		u.Avatar = avatar.HashAvatar(u.ID, data)
 		if err = user_model.UpdateUserCols(ctx, u, "use_custom_avatar", "avatar"); err != nil {
-			return fmt.Errorf("updateUser: %w", err)
+			return fmt.Errorf("UploadAvatar: failed to update user avatar: %w", err)
 		}
 
 		if err := storage.SaveFrom(storage.Avatars, u.CustomAvatarRelativePath(), func(w io.Writer) error {
 			_, err := w.Write(avatarData)
 			return err
 		}); err != nil {
-			return fmt.Errorf("Failed to create dir %s: %w", u.CustomAvatarRelativePath(), err)
+			return fmt.Errorf("UploadAvatar: failed to save user avatar %s: %w", u.CustomAvatarRelativePath(), err)
 		}
 
 		return nil