diff --git a/lib/client/storage/_github.js b/lib/client/storage/_github.js
index 9a63cb12..6c0b2c9f 100644
--- a/lib/client/storage/_github.js
+++ b/lib/client/storage/_github.js
@@ -28,16 +28,14 @@ var CloudCmd, Util, join, DOM, CloudFunc, Github, cb;
             Events.add('message', function(event) {
                 if (event.origin === document.location.origin) {
                     Popup.close();
-                    GitHub.autorize(event.data);
+                    GitHub.autorize(function() {
+                        Util.exec.series([
+                            GitHub.getUserData,
+                            Util.exec.ret(callback)
+                        ]);
+                    }, event.data);
                 }
             });
-            
-            GitHub.callback = function() {
-                Util.exec.series([
-                    GitHub.getUserData,
-                    Util.exec.ret(callback)
-                ]);
-            };
         }
         
         function load(callback) {