diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 2810df5f..4f61c064 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -310,7 +310,7 @@ namespace TShockAPI
                 if (exr[0].ToUpper() == encrPass.ToUpper())
                 {
                     args.Player.Group = Tools.GetGroup(exr[1]);
-                    args.Player.UserName = args.Parameters[0];
+                    args.Player.UserAccountName = args.Parameters[0];
                     args.Player.IsLoggedIn = true;
                     args.Player.SendMessage("Authenticated as " + args.Parameters[0] + " successfully.", Color.LimeGreen);
                     Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user: " + args.Parameters[0]);
@@ -1418,7 +1418,7 @@ namespace TShockAPI
                                     regionName = regionName + " " + args.Parameters[i];
                                 }
                             }
-                            if ((playerID = TShock.Users.GetUserByName(Tools.FindPlayer(playerName)[0].UserName)) != null)
+                            if ((playerID = TShock.Users.GetUserByName(Tools.FindPlayer(playerName)[0].Name)) != null)
                             {
                                 if (TShock.Regions.AddNewUser(regionName, playerID))
                                 {
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index 55d00d48..2e9d217f 100644
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -47,7 +47,7 @@ namespace TShockAPI
         public TSPlayer LastWhisper;
         public int LoginAttempts { get; set; }
         public Vector2 TeleportCoords = new Vector2(-1, -1);
-        public string UserName { get; set; }
+        public string UserAccountName { get; set; }
         public bool HasBeenSpammedWithBuildMessage = false;
         public bool IsLoggedIn = false;
         Player FakePlayer = null;