diff --git a/lib/client/config.js b/lib/client/config.js
index 9f3c9ab9..a4d856c2 100644
--- a/lib/client/config.js
+++ b/lib/client/config.js
@@ -156,10 +156,9 @@ var CloudCmd, Util, DOM;
                     Notify.request();
             }
             
-            CONFIG[name] = data;
-            
-            DOM.Files.set('config', CONFIG, function() {
-                Config.write(obj);
+            Config.write(obj, function() {
+                CONFIG[name] = data;
+                DOM.Files.set('config', CONFIG);
             });
         }
         
diff --git a/lib/client/files.js b/lib/client/files.js
index ed6bdb66..79e552e7 100644
--- a/lib/client/files.js
+++ b/lib/client/files.js
@@ -57,7 +57,7 @@ var Util, DOM, CloudCmd;
                 showError(name);
             } else {
                 Data[name] = data;
-                callback(null);
+                Util.exec(callback);
             }
             
             if (name === 'config')