diff --git a/wrenchboard/src/shared_tool/media.cc b/wrenchboard/src/shared_tool/media.cc
index 1e3cbce8..91099e12 100644
--- a/wrenchboard/src/shared_tool/media.cc
+++ b/wrenchboard/src/shared_tool/media.cc
@@ -74,8 +74,8 @@ long WrenchFindStoredMedia(CVars in, CVars &out) {
                 break;
 
                 case WRENCH_FILE_FAMILY:
-                    snprintf(vname, sizeof (vname), "SELECT profile_pic AS saved_file_name "
-                                                    " FROM members WHERE id = (SELECT family_member_id FROM members_family WHERE uid = '%s')", in["file_uid"].c_str());
+                    snprintf(vname, sizeof (vname), "SELECT uid AS member_uid, profile_pic AS saved_file_name, %s AS family_uid "
+                                                    " FROM members WHERE id = (SELECT family_member_id FROM members_family WHERE uid = '%s')", in["file_uid"].c_str(),, in["file_uid"].c_str());
                 break;
       }
 
diff --git a/www-api/app/Controllers/WrenchMedia.php b/www-api/app/Controllers/WrenchMedia.php
index 99c892b2..068332b3 100644
--- a/www-api/app/Controllers/WrenchMedia.php
+++ b/www-api/app/Controllers/WrenchMedia.php
@@ -120,7 +120,7 @@ class WrenchMedia extends BaseController
 
             case WRENCH_FILE_FAMILY:
                 ///opt/wrenchboard/TEST/PROFILE/3119b744-42ad-4834-bb83-b737588754ca/FAMILY/3119b744-42ad-4834-bb83-b737588754ca/
-                $selectedFile = $this->savePath.'PROFILE/'.$out["member_uid"]."/FAMILY/family_uid/". $out["saved_file_name"];
+                $selectedFile = $this->savePath.'PROFILE/'.$out["member_uid"]."/FAMILY/".$out["family_uid"]."/". $out["saved_file_name"];
                 break;
 
             case WRENCH_FILE_MYFILE: