diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 90af82eef0..e19631eaf8 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -532,7 +532,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 UserData user = new UserData();
                 user.Id = id;
 
-                if (creatorData != null && creatorData != string.Empty)
+                if (!string.IsNullOrEmpty(creatorData))
                 {
                     //creatorData = <endpoint>;<name>
 
@@ -553,14 +553,12 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     }
                     if (parts.Length >= 2)
                         user.FirstName = parts[1].Replace(' ', '.');
-                }
-                else
-                {
-                    user.FirstName = "Unknown";
-                    user.LastName = "UserUMMAU2";
-                }
 
-                AddUserInternal(user);
+                    AddUserInternal(user);
+
+                }
+                // else don't add the user to the cache, period.
+
             }
         }