diff --git a/www/assets/js/settings.js b/www/assets/js/settings.js
index cb9e6ef..94fa38d 100644
--- a/www/assets/js/settings.js
+++ b/www/assets/js/settings.js
@@ -12,6 +12,7 @@ function logout() {
             function () {
                 localStorage.removeItem('password');
                 localStorage.removeItem('username');
+                localStorage.removeItem('lastsync');
                 restartApplication();
             }
     );
diff --git a/www/assets/js/sync.js b/www/assets/js/sync.js
index e762ed8..e52c445 100644
--- a/www/assets/js/sync.js
+++ b/www/assets/js/sync.js
@@ -8,8 +8,13 @@
 function gatherSyncData() {
     var data = {
         localStorage: {},
-        changed: getStorage("lastchange") == null ? 0 : getStorage("lastchange")
+        changed: getStorage("lastchange") == null ? 0 : getStorage("lastchange"),
     };
+    if (!inStorage("lastsync")) {
+        // first time syncing to the server, let's make sure
+        // the server settings take precedence
+        data.changed = 1;
+    }
     var allitems = getAllStorage();
     for (var i = 0; i < allitems.length; i++) {
         var key = allitems[i].key;