diff --git a/templates/user/create_user.twig b/templates/user/create_user.twig
index 0c342f896bd4f42f140037474c97a1c75195dd30..f91860aa47362db488a8cd7c9230fe24f9206196 100644
--- a/templates/user/create_user.twig
+++ b/templates/user/create_user.twig
@@ -46,6 +46,8 @@
             </input>
         </div>
         </div>
+        <input type="hidden" name="longitude" id="longitude-input">
+        <input type="hidden" name="latitude"  id="latitude-input">
         <div class="field col o6">
             <input type="submit" class="ui submit button">
         </div>
@@ -56,7 +58,8 @@
         if (!navigator.geolocation) { return; }
 
         navigator.geolocation.getCurrentPosition(function(position) {
-            console.log(position.coords.latitude, position.coords.longitude);
+            $('#latitude-input').val(position.coords.latitude);
+            $('#longitude-input').val(position.coords.longitude);
         });
     });
 </script>
diff --git a/templates/user/user_profile.twig b/templates/user/user_profile.twig
index 7da5f56744369eed7468e7e67d347116f0faf4c3..9a55bf4072f557137af569dbeef791ae5e4bb0cf 100644
--- a/templates/user/user_profile.twig
+++ b/templates/user/user_profile.twig
@@ -16,6 +16,11 @@
             <button type="submit" class="ui button"><i class="edit icon"></i></button>
           </form>
           <button class="ui button" id="delete_user_button"><i class="trash icon"></i></button>
+          <form action="/account/location" method="post">
+            <input type="hidden" name="longitude" id="longitude-input">
+            <input type="hidden" name="latitude"  id="latitude-input">
+            <button type="submit" class="ui disabled button" id="location-button"><i class="street view icon"></i></button>
+          </form>
           {% endif %}
         </div>
       </div>
@@ -26,7 +31,7 @@
 
 <div class="col s12 m12 l12 xl12 ">
   <h2> Groups </h2>
-  <div class="ui relaxed divided list" style="overflow:scroll">
+  <div class="ui relaxed divided list" style="overflow:scroll; min-height: 300px;">
     {% for group in user.getGroups %}
     {% if not group.isPrivate %}
     <div class="item">