diff --git a/public/locales/fr.json b/public/locales/fr.json
index 80ae5c3587..de1415f7b1 100644
--- a/public/locales/fr.json
+++ b/public/locales/fr.json
@@ -127,6 +127,15 @@
     "createSampleOrganization": "Créer une organisation d'exemple",
     "description": "La description",
     "location": "Emplacement",
+    "address": "Adresse",
+    "city": "Ville",
+    "countryCode": "Code Pays",
+    "line1": "Ligne 1",
+    "line2": "Ligne 2",
+    "postalCode": "Code Postal",
+    "dependentLocality": "Localité Dépendante",
+    "sortingCode": "Code de Tri",
+    "state": "État / Province",
     "userRegistrationRequired": "enregistrement requis",
     "visibleInSearch": "Visible dans la recherche",
     "displayImage": "Afficher l'image",
@@ -484,6 +493,15 @@
     "name": "Nom",
     "description": "La description",
     "location": "emplacement",
+    "address": "Adresse",
+    "city": "Ville",
+    "countryCode": "Code Pays",
+    "line1": "Ligne 1",
+    "line2": "Ligne 2",
+    "postalCode": "Code Postal",
+    "dependentLocality": "Localité Dépendante",
+    "sortingCode": "Code de Tri",
+    "state": "État / Province",
     "displayImage": "Afficher l'image",
     "userRegistrationRequired": "enregistrement requis",
     "isVisibleInSearch": "Visible dans la recherche",
diff --git a/public/locales/hi.json b/public/locales/hi.json
index 9cec18077c..3d9d86398b 100644
--- a/public/locales/hi.json
+++ b/public/locales/hi.json
@@ -127,6 +127,15 @@
     "createSampleOrganization": " सैंपल संगठन बनाएं",
     "description": "विवरण",
     "location": "स्थान",
+    "address": "पता",
+    "city": "शहर",
+    "countryCode": "देश कोड",
+    "line1": "लाइन 1",
+    "line2": "लाइन 2",
+    "postalCode": "पोस्टल कोड",
+    "dependentLocality": "आश्रित स्थान",
+    "sortingCode": "क्रमबद्ध कोड",
+    "state": "राज्य / प्रांत",
     "userRegistrationRequired": "उपयोगकर्ता पंजीकरण आवश्यक",
     "visibleInSearch": "खोज में दृश्यमान",
     "displayImage": "प्रदर्शन छवि",
@@ -483,6 +492,15 @@
     "name": "नाम",
     "description": "विवरण",
     "location": "जगह",
+    "address": "पता",
+    "city": "शहर",
+    "countryCode": "देश कोड",
+    "line1": "लाइन 1",
+    "line2": "लाइन 2",
+    "postalCode": "पोस्टल कोड",
+    "dependentLocality": "आश्रित स्थान",
+    "sortingCode": "क्रमबद्ध कोड",
+    "state": "राज्य / प्रांत",
     "displayImage": "प्रदर्शन छवि",
     "userRegistrationRequired": "उपयोगकर्ता पंजीकरण आवश्यक",
     "isVisibleInSearch": "खोज में दिखाए जा सकते हैं",
diff --git a/public/locales/sp.json b/public/locales/sp.json
index 4b090a0eb5..dc4b72fba0 100644
--- a/public/locales/sp.json
+++ b/public/locales/sp.json
@@ -127,6 +127,15 @@
     "createSampleOrganization": "Crear organización de muestra",
     "description": "Descripción",
     "location": "Ubicación",
+    "address": "Dirección",
+    "city": "Ciudad",
+    "countryCode": "Código de País",
+    "line1": "Línea 1",
+    "line2": "Línea 2",
+    "postalCode": "Código Postal",
+    "dependentLocality": "Localidad Dependiente",
+    "sortingCode": "Código de Ordenamiento",
+    "state": "Estado / Provincia",
     "userRegistrationRequired": "Registro de usuario requerido",
     "visibleInSearch": "Visible en la búsqueda",
     "displayImage": "Mostrar imagen",
@@ -483,6 +492,15 @@
     "name": "Nombre",
     "description": "Descripción",
     "location": "ubicación",
+    "address": "Dirección",
+    "city": "Ciudad",
+    "countryCode": "Código de País",
+    "line1": "Línea 1",
+    "line2": "Línea 2",
+    "postalCode": "Código Postal",
+    "dependentLocality": "Localidad Dependiente",
+    "sortingCode": "Código de Ordenamiento",
+    "state": "Estado / Provincia",
     "displayImage": "Mostrar imagen",
     "userRegistrationRequired": "Registro de usuario requerido",
     "isVisibleInSearch": "Visible en la búsqueda",
diff --git a/public/locales/zh.json b/public/locales/zh.json
index daacd5ec93..632a18b70a 100644
--- a/public/locales/zh.json
+++ b/public/locales/zh.json
@@ -127,6 +127,15 @@
     "createSampleOrganization": "创建示范组织",
     "description": "描述",
     "location": "地點",
+    "address": "地址",
+    "city": "城市",
+    "countryCode": "国家代码",
+    "line1": "地址行 1",
+    "line2": "地址行 2",
+    "postalCode": "邮政编码",
+    "dependentLocality": "从属地区",
+    "sortingCode": "排序代码",
+    "state": "省 / 直辖市",
     "isPubluserRegistrationRequiredic": "需要用户注册",
     "visibleInSearch": "在搜索中可見",
     "displayImage": "顯示圖像",
@@ -483,6 +492,15 @@
     "name": "姓名",
     "description": "描述",
     "location": "地點",
+    "address": "地址",
+    "city": "城市",
+    "countryCode": "国家代码",
+    "line1": "地址行 1",
+    "line2": "地址行 2",
+    "postalCode": "邮政编码",
+    "dependentLocality": "从属地区",
+    "sortingCode": "排序代码",
+    "state": "省 / 直辖市",
     "displayImage": "顯示圖像",
     "userRegistrationRequired": "需要用户注册",
     "isVisibleInSearch": "在搜索中可见",
diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
index fa262775a3..835ddcb169 100644
--- a/src/GraphQl/Queries/Queries.ts
+++ b/src/GraphQl/Queries/Queries.ts
@@ -34,7 +34,16 @@ export const ORGANIZATION_LIST = gql`
         _id
       }
       createdAt
-      address
+      address {
+        city
+        countryCode
+        dependentLocality
+        line1
+        line2
+        postalCode
+        sortingCode
+        state
+      }
     }
   }
 `;
@@ -112,7 +121,16 @@ export const USER_LIST = gql`
         _id
         name
         image
-        address
+        address {
+          city
+          countryCode
+          dependentLocality
+          line1
+          line2
+          postalCode
+          sortingCode
+          state
+        }
         createdAt
         creator {
           _id
@@ -127,7 +145,16 @@ export const USER_LIST = gql`
         _id
         name
         image
-        address
+        address {
+          city
+          countryCode
+          dependentLocality
+          line1
+          line2
+          postalCode
+          sortingCode
+          state
+        }
         createdAt
         creator {
           _id
diff --git a/src/components/UsersTableItem/UsersTableItem.tsx b/src/components/UsersTableItem/UsersTableItem.tsx
index 01617098e0..f0a2ac3007 100644
--- a/src/components/UsersTableItem/UsersTableItem.tsx
+++ b/src/components/UsersTableItem/UsersTableItem.tsx
@@ -317,7 +317,7 @@ const UsersTableItem = (props: Props): JSX.Element => {
                             {org.name}
                           </Button>
                         </td>
-                        <td>{org.address.city}</td>
+                        {org.address && <td>{org.address.city}</td>}
                         <td>{dayjs(org.createdAt).format('DD-MM-YYYY')}</td>
                         <td>
                           <Button
@@ -494,7 +494,7 @@ const UsersTableItem = (props: Props): JSX.Element => {
                             {org.name}
                           </Button>
                         </td>
-                        <td>{org.address.city}</td>
+                        {org.address && <td>{org.address.city}</td>}
                         <td>{dayjs(org.createdAt).format('DD-MM-YYYY')}</td>
                         <td>
                           <Button