diff --git a/components/Author.vue b/components/Author.vue
index 53379afa8..e313066a6 100644
--- a/components/Author.vue
+++ b/components/Author.vue
@@ -54,9 +54,20 @@
       <hc-badges
         v-if="author.badges && author.badges.length"
         :badges="author.badges"
-        style="margin-bottom: -10px"
       />
-      <ds-flex>
+      <ds-text
+        v-if="author.location"
+        align="center"
+        color="soft"
+        size="small"
+        style="margin-top: 5px"
+        bold
+      >
+        <ds-icon name="map-marker" /> {{ author.location.name }}
+      </ds-text>
+      <ds-flex
+        style="margin-top: -10px"
+      >
         <ds-flex-item class="ds-tab-nav-item">
           <ds-space margin="small">
             <ds-number
diff --git a/graphql/UserProfileQuery.js b/graphql/UserProfileQuery.js
index 2a283d0d4..a67d0d927 100644
--- a/graphql/UserProfileQuery.js
+++ b/graphql/UserProfileQuery.js
@@ -70,6 +70,9 @@ export default gql(`
           id
           avatar
           name
+          location {
+            name
+          }
         }
       }
     }
diff --git a/pages/index.vue b/pages/index.vue
index ca4ebc03c..58fdb284d 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -97,6 +97,9 @@ export default {
               shoutedCount
               commentsCount
               followedByCount
+              location {
+                name
+              }
               badges {
                 id
                 key
diff --git a/pages/post/_slug/index.vue b/pages/post/_slug/index.vue
index 949263e95..2b6b91f05 100644
--- a/pages/post/_slug/index.vue
+++ b/pages/post/_slug/index.vue
@@ -161,6 +161,9 @@ export default {
               contributionsCount
               commentsCount
               followedByCount
+              location {
+                name
+              }
               badges {
                 id
                 key
@@ -185,6 +188,9 @@ export default {
                 contributionsCount
                 commentsCount
                 followedByCount
+                location {
+                  name
+                }
                 badges {
                   id
                   key
diff --git a/pages/post/_slug/more-info.vue b/pages/post/_slug/more-info.vue
index 8ea1ed734..1530c03b2 100644
--- a/pages/post/_slug/more-info.vue
+++ b/pages/post/_slug/more-info.vue
@@ -107,6 +107,9 @@ export default {
                 contributionsCount
                 followedByCount
                 commentsCount
+                location {
+                  name
+                }
                 badges {
                   id
                   key