diff --git a/api/user.go b/api/user.go
index d69244fad1..727accd1fd 100644
--- a/api/user.go
+++ b/api/user.go
@@ -71,10 +71,7 @@ func createUser(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if !model.IsUsernameValid(user.Username) {
-		c.Err = model.NewAppError("createUser", "That username is invalid", "might be using a resrved username")
-		return
-	}
+	// the user's username is checked to be valid when they are saved to the database
 
 	user.EmailVerified = false
 
diff --git a/model/user.go b/model/user.go
index 9f90b82042..05fc969537 100644
--- a/model/user.go
+++ b/model/user.go
@@ -335,11 +335,6 @@ func ComparePassword(hash string, password string) bool {
 	return err == nil
 }
 
-func IsUsernameValid(username string) bool {
-
-	return true
-}
-
 var validUsernameChars = regexp.MustCompile(`^[a-z0-9\.\-_]+$`)
 
 var restrictedUsernames = []string{