diff --git a/models/user_add_update.go b/models/user_add_update.go
index f80a7502..d77610f9 100644
--- a/models/user_add_update.go
+++ b/models/user_add_update.go
@@ -75,6 +75,11 @@ func CreateUser(user User) (newUser User, err error) {
 		return User{}, err
 	}
 
+	// Dont send a mail if we're testing
+	if IsTesting {
+		return newUserOut, err
+	}
+
 	// Send the user a mail with a link to confirm the mail
 	data := map[string]interface{}{
 		"User": newUserOut,
diff --git a/models/user_test.go b/models/user_test.go
index e7975f6f..ad23c263 100644
--- a/models/user_test.go
+++ b/models/user_test.go
@@ -133,7 +133,6 @@ func TestUserPasswordReset(t *testing.T) {
 
 	// Try resetting it
 	reset := &PasswordReset{
-		UserID: 1,
 		Token:  userWithToken.PasswordResetToken,
 	}