diff --git a/www/assets/js/manage.js b/www/assets/js/manage.js
index 528aafd..eb24170 100644
--- a/www/assets/js/manage.js
+++ b/www/assets/js/manage.js
@@ -60,6 +60,12 @@ $("#addpackagebtn").click(function () {
         });
         return;
     }
+
+    // Save city/state if changed
+    if (localStorage.getItem("citystate") != $("input[name=citystate]").val().trim()) {
+        localStorage.setItem("citystate", $("input[name=citystate]").val().trim());
+    }
+
     var address = ($("input[name=number]").val() + " " + $("input[name=street]").val()).toUpperCase();
     $.getJSON(geocodeapi, {
         address: address + " " + $("input[name=citystate]").val().toUpperCase()
@@ -88,3 +94,8 @@ $("#addpackagebtn").click(function () {
         }
     });
 });
+
+// Restore user's last entered city/state combo
+if (localStorage.getItem("citystate") != null) {
+    $("input[name=citystate]").val(localStorage.getItem("citystate"));
+}
\ No newline at end of file