diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
index 230a70789b..ef8f7dddf0 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oManager.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -123,11 +123,10 @@ namespace OpenSim.Framework.Data.DB4o
             IObjectSet result = database.Get(typeof(UserProfileData));
             foreach (UserProfileData row in result)
             {
-                if (!userProfiles.ContainsKey(row.UUID))
-                {
+                if (userProfiles.ContainsKey(row.UUID))
+                    userProfiles[row.UUID] = row;
+                else
                     userProfiles.Add(row.UUID, row);
-                }
-                
             }
             database.Close();
         }