diff --git a/models/team_list_test.go b/models/team_list_test.go
index 84aeec739..95fafbf14 100644
--- a/models/team_list_test.go
+++ b/models/team_list_test.go
@@ -81,6 +81,6 @@ func TestTeamList(t *testing.T) {
 	// Delete with a nonexistant list
 	err = tl4.Delete()
 	assert.Error(t, err)
-	assert.True(t, IsErrListDoesNotExist(err))
+	assert.True(t, IsErrTeamDoesNotHaveAccessToList(err))
 
 }
diff --git a/models/team_namespace_test.go b/models/team_namespace_test.go
index f3502d4c5..ed5c4c2ac 100644
--- a/models/team_namespace_test.go
+++ b/models/team_namespace_test.go
@@ -79,6 +79,6 @@ func TestTeamNamespace(t *testing.T) {
 	// Try deleting with a nonexistant namespace
 	err = tn4.Delete()
 	assert.Error(t, err)
-	assert.True(t, IsErrNamespaceDoesNotExist(err))
+	assert.True(t, IsErrTeamDoesNotHaveAccessToNamespace(err))
 
 }
diff --git a/models/user_add_update.go b/models/user_add_update.go
index 08e0d19b2..6c20e39a0 100644
--- a/models/user_add_update.go
+++ b/models/user_add_update.go
@@ -15,24 +15,25 @@ func CreateUser(user User) (newUser User, err error) {
 	}
 
 	// Check if the user already existst with that username
-	var exists bool
+	exists := true
 	existingUser, err := GetUser(User{Username: newUser.Username})
 	if err != nil {
 		if IsErrUserDoesNotExist(err) {
-			exists = true
+			exists = false
 		} else {
 			return User{}, err
 		}
 	}
 	if exists {
-		return User{}, ErrUsernameExists{existingUser.ID, existingUser.Username}
+		return User{}, ErrUsernameExists{newUser.ID, newUser.Username}
 	}
 
 	// Check if the user already existst with that email
+	exists = true
 	existingUser, err = GetUser(User{Email: newUser.Email})
-	if err != nil && !IsErrUserDoesNotExist(err) {
+	if err != nil {
 		if IsErrUserDoesNotExist(err) {
-			exists = true
+			exists = false
 		} else {
 			return User{}, err
 		}