diff --git a/client/_propose_upgrade.html b/client/_propose_upgrade.html
index 5d8b961..e23f4d3 100644
--- a/client/_propose_upgrade.html
+++ b/client/_propose_upgrade.html
@@ -34,7 +34,7 @@
   </div>
 
   <div style="text-align:center">
-    <iframe style="border:none;width:500px;height:340px;" id="upgrade-frame-ad" src="about:blank"></iframe>
+  <!---<iframe style="border:none;width:500px;height:340px;" id="upgrade-frame-ad" src="about:blank"></iframe>-->
   </div>
 
   <div class="propose-upgrade-timer">
@@ -45,11 +45,11 @@ <h4>You can continue in <span id="propose-upgrade-seconds-remaining">5</span> se
   </div>
   
   {{{ concat "<scr" "ipt>" }}}
-  var doc = document.getElementById('upgrade-frame-ad').contentWindow.document;
-  doc.open();
-  var ads = Handlebars.compile($('#upgrade-ads').html());
-  doc.write(ads());
-  doc.close();
+  //var doc = document.getElementById('upgrade-frame-ad').contentWindow.document;
+  //doc.open();
+  //var ads = Handlebars.compile($('#upgrade-ads').html());
+  //doc.write(ads());
+  //doc.close();
 
   var secondsElem = $("#propose-upgrade-seconds-remaining");
   var initial = secondsElem.html();
diff --git a/client/assets/js/Controller/Application.js b/client/assets/js/Controller/Application.js
index 8aec36a..a190e24 100644
--- a/client/assets/js/Controller/Application.js
+++ b/client/assets/js/Controller/Application.js
@@ -121,7 +121,7 @@ ApplicationController.prototype.propose_upgrade = function() {
 
   // If we reach the rotation count, we reset the counter + show the popup
   // Otherwise, we save the current count
-  if(count % 3 == 0) {
+  if(count % 5 == 0) {
     setCookie("propose-upgrade-count", 0);
     new Popup({ 
       title : i18n('Upgrade!'), 
diff --git a/client/editor-layout.tt b/client/editor-layout.tt
index aecc621..b7476ad 100644
--- a/client/editor-layout.tt
+++ b/client/editor-layout.tt
@@ -39,15 +39,18 @@
   [% INCLUDE app.tt %]
 
   <script>
-    var _gsi_loaded = false;
     var _gapi_loaded = false;
     function gsi_loaded(){
-      _gsi_loaded = true;
-      if(_gapi_loaded) application.controllers.google_oauth.init()
+      if(!_gapi_loaded) {
+        _gapi_loaded = true;
+        application.controllers.google_oauth.init();
+      }
     }
     function gapi_loaded(){
-      _gapi_loaded = true;
-      if(_gapi_loaded) application.controllers.google_oauth.init()
+      if(!_gapi_loaded) {
+        _gapi_loaded = true;
+        application.controllers.google_oauth.init();
+      }
     }
   </script>