diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index abd9bbf1ae..24f436d40e 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -388,8 +388,8 @@ namespace OpenSim.Services.UserAccountService
             string rawPrincipalId;
             string model;
 
-            List<char> excluded = new List<char>(new char[]{' '});
-
+           // List<char> excluded = new List<char>(new char[]{' '});
+            List<char> excluded = new List<char>(new char[]{' ', '@', '.', ':' }); //Protect user names from using valid HG identifiers.
             if (cmdparams.Length < 3)
                 firstName = MainConsole.Instance.CmdPrompt("First name", "Default", excluded);
             else firstName = cmdparams[2];