diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 53c6f55032..d00b102706 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -779,20 +779,13 @@ namespace OpenSim.Services.LLLoginService
                     continue;
                 LLLoginResponse.BuddyList.BuddyInfo buddyitem = new LLLoginResponse.BuddyList.BuddyInfo(finfo.Friend);
                 // finfo.Friend may not be a simple uuid
-                UUID friendID = UUID.Zero;
-                if (UUID.TryParse(finfo.Friend, out friendID))
-                    buddyitem.BuddyID = finfo.Friend;
+                if (Util.ParseUniversalUserIdentifier(finfo.Friend, out UUID friendID))
+                    buddyitem.BuddyID = friendID.ToString();
                 else
-                {
-                    string tmp;
-                    if (Util.ParseUniversalUserIdentifier(finfo.Friend, out friendID, out tmp, out tmp, out tmp, out tmp))
-                        buddyitem.BuddyID = friendID.ToString();
-                    else
-                        // junk entry
-                        continue;
-                }
-                buddyitem.BuddyRightsHave = (int)finfo.TheirFlags;
-                buddyitem.BuddyRightsGiven = (int)finfo.MyFlags;
+                    continue; // junk entry
+
+                buddyitem.BuddyRightsHave = finfo.TheirFlags;
+                buddyitem.BuddyRightsGiven = finfo.MyFlags;
                 buddylistreturn.AddNewBuddy(buddyitem);
             }
             return buddylistreturn;