diff --git a/js/geolocation.js b/js/geolocation.js
index 6da22d6..5eb875e 100644
--- a/js/geolocation.js
+++ b/js/geolocation.js
@@ -247,8 +247,8 @@
           case 'locality':
             var locality = component.long_name;
             break;
-          case 'administrative_area_level_2':
-            var administrativeArea = component.long_name;
+          case 'administrative_area_level_1':
+            var administrativeArea = component.short_name;
             break;
         }
       }
@@ -273,8 +273,8 @@
         $addressDetails.find('.organization').val(premise);
         $addressDetails.find('.address-line1').val(addressLine1);
         $addressDetails.find('.address-line2').val(addressLine2);
-        $addressDetails.find('.locality').val(postalTown);
-        $addressDetails.find('.administrative-area').val(administrativeArea);
+        $addressDetails.find('.locality').val(locality);
+        $addressDetails.find('.administrative-area').val(countryCode + '-' + administrativeArea);
         $addressDetails.find('.postal-code').val(postalCode);
       });
     }