diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index cfd486f7f32af58557bebbfcb5923d680ab47db1..4fd39d12117ac933379f12137eee818a5ac03478 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -1230,8 +1230,12 @@ void LLPanelLogin::populateUserList(LLPointer<LLCredential> credential)
     {
         if (credential.notNull())
         {
-            user_combo->add(LLPanelLogin::getUserName(credential), credential->userID(), ADD_BOTTOM, TRUE);
-            setFields(credential);
+            const LLSD &ident = credential->getIdentifier();
+            if (ident.isMap() && ident.has("type"))
+            {
+                user_combo->add(LLPanelLogin::getUserName(credential), credential->userID(), ADD_BOTTOM, TRUE);
+                setFields(credential);
+            }
         }
     }
 }