Index: cloud_sync.py
===================================================================
diff -u -r78fd392821abf65d46d47982d391808a02c34249 -rc7fd30aa9eafcefd698820e703b3313a8286cde9
--- cloud_sync.py	(.../cloud_sync.py)	(revision 78fd392821abf65d46d47982d391808a02c34249)
+++ cloud_sync.py	(.../cloud_sync.py)	(revision c7fd30aa9eafcefd698820e703b3313a8286cde9)
@@ -32,14 +32,37 @@
 
 sleep(5)  # wait for UI to prepare the configurations partition
 
+
+# set the execution mode regarding the passed command line argumment
+
 try:
-    if os.path.isfile(OPERATION_CONFIG_FILE_PATH) and os.access(OPERATION_CONFIG_FILE_PATH, os.R_OK):
-        g_config = helpers_read_config(OPERATION_CONFIG_FILE_PATH)
-        CONFIG_PATH = OPERATION_CONFIG_FILE_PATH
+    ok = False
+    print(SETUP_CONSOLE_LINE)
+
+    if EXEC_MODE_REGISTRATION_KEY in arguments:
+        # Read from $HOME
+        if os.path.isfile(CONFIG_PATH) and os.access(CONFIG_PATH, os.R_OK | os.W_OK):
+            g_config = helpers_read_config(CONFIG_PATH)
+            EXEC_MODE = EXEC_MODE_REGISTRATION
+            ok = True
     else:
-        g_config = helpers_read_config(CONFIG_PATH)
+        # Read from /var/configuraitons/
+        if os.path.isfile(OPERATION_CONFIG_FILE_PATH) and os.access(OPERATION_CONFIG_FILE_PATH, os.R_OK):
+            g_config = helpers_read_config(OPERATION_CONFIG_FILE_PATH) 
+            CONFIG_PATH = OPERATION_CONFIG_FILE_PATH
+            ok = True
+
+    if ok:
+        print("CloudSync started in {0} mode".format(EXEC_MODE))
+        print("Using config: ".format(CONFIG_PATH))
+    else:
+        g_utils.logger.error("Error reading config file in {0}".format(EXEC_MODE))
+    
+    print(SETUP_CONSOLE_LINE)
+
 except Exception as e:
     g_utils.logger.error("Error reading config file - {0}".format(e))
+    print(SETUP_CONSOLE_LINE)
     sys.exit(0)
 
 try: