diff --git a/agkyra/nwgui/settings.html b/agkyra/nwgui/settings.html
index c8b35de669e812a2e1a34b4ad9653ad576c42497..468d43d43ede048be04c3bb592a570e7c5830b44 100644
--- a/agkyra/nwgui/settings.html
+++ b/agkyra/nwgui/settings.html
@@ -208,6 +208,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 document.getElementById('title').innerHTML = SETTINGS.TITLE;
                 document.getElementById('appearance_label').innerHTML = SETTINGS.APPEARANCE;
                 document.getElementById('language_label').innerHTML = SETTINGS.LANGUAGE;
+                document.getElementById('start_sync_label').innerHTML = SETTINGS.SYNCONSTART;
                 document.getElementById('cloud_label').innerHTML = SETTINGS.CLOUD;
                 document.getElementById('url_label').innerHTML = SETTINGS.URL;
                 document.getElementById('token_label').innerHTML = SETTINGS.TOKEN;
diff --git a/agkyra/protocol.py b/agkyra/protocol.py
index 49879326f49e425a1c6f41d60b38a9824bcd3097..3a3c137cfeb93fc7961d713fab3c24d0251090bb 100644
--- a/agkyra/protocol.py
+++ b/agkyra/protocol.py
@@ -619,7 +619,7 @@ class WebSocketProtocol(WebSocket):
             self._load_settings()
             if (not self.syncer) and self.can_sync():
                 self.init_sync()
-                if self.syncer:
+                if self.syncer and self.settings['sync_on_start']:
                     self.start_sync()
         else:
             action = r.get('path', 'ui_id')
diff --git a/agkyra/ui_data/common_el.json b/agkyra/ui_data/common_el.json
index f68046c3fea5ec0d5f6a7a3562daf1410771f5d3..08e0a3878e7d58b364482dd6410f9718aa9425d4 100644
--- a/agkyra/ui_data/common_el.json
+++ b/agkyra/ui_data/common_el.json
@@ -50,6 +50,7 @@
         "TITLE": "ΑυθμίσΡις χρΞ�στη",
         "APPEARANCE": "Εμφάνιση",
         "LANGUAGE": "Ξ“Ξ»ΟŽΟƒΟƒΞ±",
+        "SYNCONSTART": "Έναρξη συγχρονισμού στην Ρκκίνηση",
         "CLOUD": "Απομακρυσμένο σύστημα (νέφος)",
         "URL": "URL νέφους",
         "TOKEN": "ΚλΡιδί token",
diff --git a/agkyra/ui_data/common_en.json b/agkyra/ui_data/common_en.json
index 9bcbbdf4e2c65e1d18a5a2e5cb79c0eb4b093f12..84d5f04a1c5a3c3d1a6a89f678b44de7f883ac03 100644
--- a/agkyra/ui_data/common_en.json
+++ b/agkyra/ui_data/common_en.json
@@ -50,6 +50,7 @@
         "TITLE": "User Settings",
         "APPEARANCE": "Appearance",
         "LANGUAGE": "Language",
+        "SYNCONSTART": "Sync on start up",
         "CLOUD": "Cloud",
         "URL": "Cloud URL",
         "TOKEN": "User Token",