diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 37d57e14f1..966fbc1d16 100755
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -518,8 +518,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                         userdata.ServerURLs = new Dictionary<string, object>();
                     }
 
-                    if (userdata.ServerURLs != null && userdata.ServerURLs.ContainsKey(serverType) && userdata.ServerURLs[serverType] != null)
-                        return userdata.ServerURLs[serverType].ToString();
+                    if (userdata.ServerURLs != null && userdata.ServerURLs.TryGetValue(serverType, out object ourl) && ourl != null)
+                        return ourl.ToString();
                 }
             }
             return string.Empty;
@@ -896,7 +896,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 }
                 else
                 {
-                    oldUser.FirstName = firstname.Replace(" ", ".") + "." + firstname.Replace(" ", ".");
+                    oldUser.FirstName = firstname + "." + lastname.Replace(" ", ".");
                     oldUser.LastName = "@" + uri.Authority;
                     oldUser.HomeURL = uri.AbsoluteUri;
                     oldUser.IsLocal = false;
@@ -904,7 +904,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
             else
             {
-                oldUser.FirstName = firstname.Replace(" ", ".") + "." + firstname.Replace(" ", ".");
+                oldUser.FirstName = firstname + "." + lastname.Replace(" ", ".");
                 oldUser.LastName = "UMMM1Unknown";
                 oldUser.IsLocal = true;
                 oldUser.HomeURL = string.Empty;
diff --git a/OpenSim/Tests/Clients/Assets/AssetsClient.cs b/OpenSim/Tests/Clients/Assets/AssetsClient.cs
index e988d0e36a..d6731ed81a 100644
--- a/OpenSim/Tests/Clients/Assets/AssetsClient.cs
+++ b/OpenSim/Tests/Clients/Assets/AssetsClient.cs
@@ -80,8 +80,6 @@ namespace OpenSim.Tests.Clients.AssetsClient
             ThreadPool.GetMinThreads(out max1, out max2);
             m_log.InfoFormat("[ASSET CLIENT]: Post set min threads = {1} - {2}", serverURI, max1, max2);
 
-            ServicePointManager.DefaultConnectionLimit = 12;
-
             AssetServicesConnector m_Connector = new AssetServicesConnector(serverURI);
             m_Connector.MaxAssetRequestConcurrency = 30;