diff --git a/models/user/user.go b/models/user/user.go
index d0f1d9d747..e581067bbd 100644
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -868,13 +868,14 @@ func updateUser(ctx context.Context, u *User, changePrimaryEmail bool, cols ...s
 		}
 
 		if !primaryEmailExist {
-			_, err = e.Insert(&EmailAddress{
+			if _, err := e.Insert(&EmailAddress{
 				Email:       u.Email,
 				UID:         u.ID,
 				IsActivated: true,
 				IsPrimary:   true,
-			})
-			return err
+			}); err != nil {
+				return err
+			}
 		}
 	}