diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 44539bfe..f685cbd4 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -583,8 +583,11 @@ namespace TShockAPI
 				// User deletion requires a username
 			else if (subcmd == "del" && args.Parameters.Count == 2)
 			{
-				var user = new User();
-				if (args.Parameters[1].Contains("."))
+				var user = new User();
+                if (args.Parameters[1].Split('.').Count() ==4)
+
+                    //              changed to support dot character in usernames
+                    //				if (args.Parameters[1].Contains("."))
 					user.Address = args.Parameters[1];
 				else
 					user.Name = args.Parameters[1];
@@ -629,8 +632,12 @@ namespace TShockAPI
 				// Group changing requires a username or IP address, and a new group to set
 			else if (subcmd == "group")
 			{
-				var user = new User();
-				if (args.Parameters[1].Contains("."))
+				var user = new User();
+			    if (args.Parameters[1].Split('.').Count()==4)
+
+                //changed to support dot character in usernames
+                //if (args.Parameters[1].Contains("."))
+
 					user.Address = args.Parameters[1];
 				else
 					user.Name = args.Parameters[1];