diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs
index 4d04db1d7..c1f651c29 100644
--- a/src/Api/Controllers/AccountsController.cs
+++ b/src/Api/Controllers/AccountsController.cs
@@ -45,7 +45,7 @@ namespace Bit.Api.Controllers
                 return;
             }
 
-            foreach(var error in result.Errors)
+            foreach(var error in result.Errors.Where(e => e.Code != "DuplicateUserName"))
             {
                 ModelState.AddModelError(string.Empty, error.Description);
             }
diff --git a/src/Api/Models/Request/Auth/AuthTokenRequestModel.cs b/src/Api/Models/Request/AuthTokenRequestModel.cs
similarity index 100%
rename from src/Api/Models/Request/Auth/AuthTokenRequestModel.cs
rename to src/Api/Models/Request/AuthTokenRequestModel.cs
diff --git a/src/Api/Models/Request/Auth/AuthTokenTwoFactorRequestModel.cs b/src/Api/Models/Request/AuthTokenTwoFactorRequestModel.cs
similarity index 100%
rename from src/Api/Models/Request/Auth/AuthTokenTwoFactorRequestModel.cs
rename to src/Api/Models/Request/AuthTokenTwoFactorRequestModel.cs
diff --git a/src/Api/Models/Request/Ciphers/CipherRequestModel.cs b/src/Api/Models/Request/CipherRequestModel.cs
similarity index 100%
rename from src/Api/Models/Request/Ciphers/CipherRequestModel.cs
rename to src/Api/Models/Request/CipherRequestModel.cs
diff --git a/src/Api/Models/Request/Folders/FolderRequestModel.cs b/src/Api/Models/Request/FolderRequestModel.cs
similarity index 100%
rename from src/Api/Models/Request/Folders/FolderRequestModel.cs
rename to src/Api/Models/Request/FolderRequestModel.cs
diff --git a/src/Api/Models/Request/Sites/SiteRequestModel.cs b/src/Api/Models/Request/SiteRequestModel.cs
similarity index 100%
rename from src/Api/Models/Request/Sites/SiteRequestModel.cs
rename to src/Api/Models/Request/SiteRequestModel.cs