diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js
index 88cf09e3..71510e8c 100644
--- a/cara/apps/calculator/static/js/form.js
+++ b/cara/apps/calculator/static/js/form.js
@@ -611,7 +611,7 @@ $(document).ready(function () {
       },
       cache: true
     },
-    placeholder: 'Search for a location',
+    placeholder: 'Geneva, CHE',
     minimumInputLength: 1,
     templateResult: formatlocation,
     templateSelection: formatLocationSelection
diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2
index 0b871e68..75cbbe5b 100644
--- a/cara/apps/calculator/templates/calculator.form.html.j2
+++ b/cara/apps/calculator/templates/calculator.form.html.j2
@@ -122,17 +122,17 @@
     </div>
     </div>
     <div class="form-group row">
-      <div class="col-sm-4"><label class="col-form-label">Location:</label></div>
-      <div class="col-sm-6 align-self-center"><select id="location_select" form="not-submitted" class="form-control" name="location_select" required></select></div>
+      <div class="col-sm-5"><label class="col-form-label">Geographic location:</label></div>
+      <div class="col-sm-5 align-self-center"><select id="location_select" form="not-submitted" class="form-control" name="location_select" required></select></div>
     </div>
     <div style="display: none">
         <!--
         This block allows us to have hidden input values which are retained during forward/back navigation, as per
         https://stackoverflow.com/a/6384276/741316
         -->
-        <input type="text" name="location_name">
-        <input type="text" name="location_latitude">
-        <input type="text" name="location_longitude">
+        <input type="text" name="location_name" value="Geneva, CHE">
+        <input type="text" name="location_latitude" value="46.20833">
+        <input type="text" name="location_longitude" value="6.14275">
     </div>
 
     <hr width="80%">