diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index b41a63594a..488b044c2c 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -3717,7 +3717,7 @@ namespace OpenSim.Framework
 
             int* seps = stackalloc int[3];
             int nseps = 0;
-            for (int i = 37; i < value.Length && nseps < 3; ++i)
+            for (int i = 36; i < value.Length && nseps < 3; ++i)
             {
                 if (value[i] == ';')
                     seps[nseps++] = i;
@@ -3792,7 +3792,7 @@ namespace OpenSim.Framework
 
             int* seps = stackalloc int[3];
             int nseps = 0;
-            for (int i = 37; i < value.Length && nseps < 3; ++i)
+            for (int i = 36; i < value.Length && nseps < 3; ++i)
             {
                 if (value[i] == ';')
                     seps[nseps++] = i;
@@ -3873,7 +3873,7 @@ namespace OpenSim.Framework
 
             int* seps = stackalloc int[3];
             int nseps = 0;
-            for (int i = 37; i < value.Length && nseps < 3; ++i)
+            for (int i = 36; i < value.Length && nseps < 3; ++i)
             {
                 if (value[i] == ';')
                     seps[nseps++] = i;
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index 788e67e4aa..10f2b69bdf 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -179,13 +179,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     {
                         if (finfo.TheirFlags != -1)
                         {
-                            if (!UUID.TryParse(finfo.Friend, out UUID id))
+                            if (Util.ParseFullUniversalUserIdentifier(finfo.Friend, out UUID id, out string url, out string first, out string last))
                             {
-                                if (Util.ParseFullUniversalUserIdentifier(finfo.Friend, out id, out string url, out string first, out string last))
-                                {
-                                    //m_log.DebugFormat("[HGFRIENDS MODULE]: caching {0}", finfo.Friend);
-                                    uMan.AddUser(id,first,last, url);
-                                }
+                                //m_log.DebugFormat("[HGFRIENDS MODULE]: caching {0}", finfo.Friend);
+                                uMan.AddUser(id,first,last, url);
                             }
                         }
                     }