diff --git a/models/list.go b/models/list.go
index d79cd02c029..a6c7db905b7 100644
--- a/models/list.go
+++ b/models/list.go
@@ -22,7 +22,7 @@ type List struct {
 func (l *List) AfterLoad() {
 
 	// Get the owner
-	l.Owner, _= GetUserByID(l.OwnerID)
+	l.Owner, _ = GetUserByID(l.OwnerID)
 
 	// Get the list tasks
 	l.Tasks, _ = GetTasksByListID(l.ID)
diff --git a/models/user_add_update.go b/models/user_add_update.go
index faaafbb520d..08e0d19b25e 100644
--- a/models/user_add_update.go
+++ b/models/user_add_update.go
@@ -84,27 +84,27 @@ func UpdateUser(user User) (updatedUser User, err error) {
 		return User{}, err
 	}
 
-		// Check if we have at least a username
-		if user.Username == "" {
-			//return User{}, ErrNoUsername{user.ID}
-			user.Username = theUser.Username // Dont change the username if we dont have one
-		}
+	// Check if we have at least a username
+	if user.Username == "" {
+		//return User{}, ErrNoUsername{user.ID}
+		user.Username = theUser.Username // Dont change the username if we dont have one
+	}
 
-		user.Password = theUser.Password // set the password to the one in the database to not accedently resetting it
+	user.Password = theUser.Password // set the password to the one in the database to not accedently resetting it
 
-		// Update it
-		_, err = x.Id(user.ID).Update(user)
-		if err != nil {
-			return User{}, err
-		}
+	// Update it
+	_, err = x.Id(user.ID).Update(user)
+	if err != nil {
+		return User{}, err
+	}
 
-		// Get the newly updated user
-		updatedUser, err = GetUserByID(user.ID)
-		if err != nil {
-			return User{}, err
-		}
+	// Get the newly updated user
+	updatedUser, err = GetUserByID(user.ID)
+	if err != nil {
+		return User{}, err
+	}
 
-		return updatedUser, err
+	return updatedUser, err
 }
 
 // UpdateUserPassword updates the password of a user
diff --git a/routes/api/v1/user_add_update.go b/routes/api/v1/user_add_update.go
index a96841258eb..b48350062e3 100644
--- a/routes/api/v1/user_add_update.go
+++ b/routes/api/v1/user_add_update.go
@@ -61,10 +61,10 @@ func userAddOrUpdate(c echo.Context) error {
 	var exists bool
 	_, err := models.GetUserByID(datUser.ID)
 	if err != nil {
-			if models.IsErrUserDoesNotExist(err) {
-				exists = true
-			} else {
-				return c.JSON(http.StatusInternalServerError, models.Message{"Could not check if the user exists."})
+		if models.IsErrUserDoesNotExist(err) {
+			exists = true
+		} else {
+			return c.JSON(http.StatusInternalServerError, models.Message{"Could not check if the user exists."})
 		}
 	}