diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 223d902a1d..1032145625 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -446,7 +446,15 @@ namespace OpenSim.Framework.Data.MySQL
 
                 retval.profileImage = new LLUUID((string) reader["profileImage"]);
                 retval.profileFirstImage = new LLUUID((string) reader["profileFirstImage"]);
-                retval.webLoginKey = new LLUUID((string)reader["webLoginKey"]);
+                
+                if( reader.IsDBNull( reader.GetOrdinal( "webLoginKey" ) ) )
+                {
+                    retval.webLoginKey = LLUUID.Random();
+                }
+                else
+                {
+                    retval.webLoginKey = new LLUUID((string)reader["webLoginKey"]);
+                }
             }
             else
             {