diff --git a/integrations/user_test.go b/integrations/user_test.go
index 6d67927d1..0a6fdd19d 100644
--- a/integrations/user_test.go
+++ b/integrations/user_test.go
@@ -74,9 +74,22 @@ func TestRenameReservedUsername(t *testing.T) {
 	prepareTestEnv(t)
 
 	reservedUsernames := []string{
+		"admin",
+		"api",
+		"attachments",
+		"avatars",
+		"explore",
 		"help",
-		"user",
+		"install",
+		"issues",
+		"login",
+		"metrics",
+		"notifications",
+		"org",
+		"pulls",
+		"repo",
 		"template",
+		"user",
 	}
 
 	session := loginUser(t, "user2")
diff --git a/models/user.go b/models/user.go
index 5e87473e8..e31f8b853 100644
--- a/models/user.go
+++ b/models/user.go
@@ -776,6 +776,7 @@ func NewGhostUser() *User {
 
 var (
 	reservedUsernames = []string{
+		"attachments",
 		"admin",
 		"api",
 		"assets",