diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsEditor.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsEditor.ascx.cs
index a365da9f..784d7962 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsEditor.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsEditor.ascx.cs
@@ -267,7 +267,7 @@ namespace WebsitePanel.Portal
                             }
                             parts = settings["UserNamePolicy"].Split(';');
 
-                            if (Utils.ParseInt(parts[3]) > 16)
+                            if (Utils.ParseInt(parts[3]) > 40)
                             {
                                 ShowWarningMessage("MySQL_USERNAME_MAX_LENGTH");
                                 return;