diff --git a/wrenchboard/src/shared_tool/account.cc b/wrenchboard/src/shared_tool/account.cc
index 1d738013..a012c097 100644
--- a/wrenchboard/src/shared_tool/account.cc
+++ b/wrenchboard/src/shared_tool/account.cc
@@ -2267,8 +2267,9 @@ long LoginWrenchBoardFamilyLogin(CVars in, CVars &out){
       try {
             REQ_STRING(in, "username", 5, 49, "(.*)");
             REQ_STRING(in, "pin", 4, 10, "(.*)");
-            const PGresult *res = pgsql_query(" SELECT member_id AS parent_member_id, id AS family_id,*, uid AS family_uid FROM members_family "
-                                              " WHERE LOWER(username)= LOWER('%s') AND pin='%s' ", in["username"].c_str(),in["pin"].c_str());
+            const PGresult *res = pgsql_query(" SELECT pm.uid AS parent_uid,  mf.member_id AS parent_member_id, mf.id AS family_id,*, mf.uid AS family_uid "
+                                              " FROM members_family mf LEFT JOIN members pm ON mf.member_id = p.id "
+                                              " WHERE LOWER(mf.username)= LOWER('%s') AND mf.pin='%s' ", in["username"].c_str(),in["pin"].c_str());
             if (res != NULL && pgsql_num_rows(res) > 0) {
                 map<const char*, const char*>f = pgsql_fetch_assoc(res, 0);
                 CVars rec;