diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index efcd0952..935110ca 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -316,10 +316,10 @@ namespace TShockAPI
             try
             {
                 string encrPass = Tools.HashPassword(args.Parameters[1]);
-                string[] exr = TShock.Users.FetchHashedPasswordAndGroup(args.Parameters[0]);
-                if (exr[0].ToUpper() == encrPass.ToUpper())
+                var user = TShock.Users.GetUserByName(args.Parameters[0]);
+                if (user.Password.ToUpper() == encrPass.ToUpper())
                 {
-                    args.Player.Group = Tools.GetGroup(exr[1]);
+                    args.Player.Group = Tools.GetGroup(user.Group);
                     args.Player.UserAccountName = args.Parameters[0];
                     args.Player.UserID = TShock.Users.GetUserID(args.Player.UserAccountName);
                     args.Player.IsLoggedIn = true;
@@ -351,8 +351,7 @@ namespace TShockAPI
                 {
                     var user = TShock.Users.GetUserByName(args.Player.UserAccountName);
                     string encrPass = Tools.HashPassword(args.Parameters[0]);
-                    string[] exr = TShock.Users.FetchHashedPasswordAndGroup(args.Player.UserAccountName);
-                    if (exr[0].ToUpper() == encrPass.ToUpper())
+                    if (user.Password.ToUpper() == encrPass.ToUpper())
                     {
                         args.Player.SendMessage("You changed your password!", Color.Green);
                         TShock.Users.SetUserPassword(user, args.Parameters[1]); // SetUserPassword will hash it for you.
diff --git a/TShockAPI/DB/UserManager.cs b/TShockAPI/DB/UserManager.cs
index a0e78ba1..3f757427 100644
--- a/TShockAPI/DB/UserManager.cs
+++ b/TShockAPI/DB/UserManager.cs
@@ -178,34 +178,6 @@ namespace TShockAPI.DB
             }
         }
 
-
-        /// <summary>
-        /// Fetches the hashed password and group for a given username
-        /// </summary>
-        /// <param name="username">string username</param>
-        /// <returns>string[] {password, group}</returns>
-        public string[] FetchHashedPasswordAndGroup(string username)
-        {
-            string[] returndata = new string[2];
-            try
-            {
-                using (var reader = database.QueryReader("SELECT * FROM Users WHERE Username=@0", username))
-                {
-                    if (reader.Read())
-                    {
-                        returndata[0] = reader.Get<string>("Password");
-                        returndata[1] = reader.Get<string>("UserGroup");
-                        return returndata;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.ConsoleError("FetchHashedPasswordAndGroup SQL returned an error: " + ex);
-            }
-            return returndata;
-        }
-
         public int GetUserID(string username)
         {
             try
@@ -314,6 +286,9 @@ namespace TShockAPI.DB
                     {
                         user.ID = reader.Get<int>("ID");
                         user.Group = reader.Get<string>("Usergroup");
+                        user.Password = reader.Get<string>("Password");
+                        user.Name = reader.Get<string>("Username");
+                        user.Address = reader.Get<string>("IP");
                         return user;
                     }
                 }
diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs
index 28934358..943b31d0 100644
--- a/TShockAPI/Properties/AssemblyInfo.cs
+++ b/TShockAPI/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 
 
-[assembly: AssemblyVersion("3.2.1.0806")]
-[assembly: AssemblyFileVersion("3.2.1.0806")]
+[assembly: AssemblyVersion("3.2.1.0807")]
+[assembly: AssemblyFileVersion("3.2.1.0807")]