diff --git a/lib/amiv/amivcore.js b/lib/amiv/amivcore.js
index cb2e1c6cbb1e3c6d5248ecf1fa63c25c2fa58eaf..dcf96c58ffcc88cbb432d4040d2d3b9b0f87e7f5 100644
--- a/lib/amiv/amivcore.js
+++ b/lib/amiv/amivcore.js
@@ -190,8 +190,8 @@
                             core.lib.authenticated = false;
                     }
                     core.lib.ready = true;
-                    if (!exec_once)
-                        setTimeout(checkAuth, core.lib.auth_interval);
+                    // if (!exec_once)
+                    //     setTimeout(checkAuth, core.lib.auth_interval);
                 });
             } else {
                 core.lib.authenticated = false;
@@ -252,6 +252,7 @@
                     set('cur_token_id', msg['id'], 1);
                     set('cur_token', msg['token'], 1);
                     set('cur_user_id', parseInt(msg['user_id']), 1);
+                    checkAuth();
                     callback(true);
                 } else {
                     set('cur_token_id', null);
@@ -271,6 +272,7 @@
                 set('cur_token', null);
                 set('cur_token_id', null);
                 set('cur_user_id', null);
+                checkAuth();
             });
         }