diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index e36e718215..cc456159ca 100755
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -1238,7 +1238,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 if (string.IsNullOrEmpty(homeuri.Host)) // take this as local
                 {
                     UserAccount account = m_userAccountService.GetUserAccount(UUID.Zero, firstname, lastname);
-                    if (account != null)
+                    if (account != null && account.PrincipalID == id)
                     {
                         oldUser.FirstName = firstname;
                         oldUser.LastName = lastname;