diff --git a/chrome_addon/background.js b/chrome_addon/background.js
index fd6453e..ce4b1fc 100644
--- a/chrome_addon/background.js
+++ b/chrome_addon/background.js
@@ -280,7 +280,7 @@ function _query_tabs_is_gpass_enabled(tabs, sendResponse)
 	is_gpass_enabled(tabs[0].url).then(
 	    function (key_present) {
 		enabled = (key_present == null);
-		update_gpass_icon((enabled)?GPASS_ICON.ENABLED:GPASS_ICON.DISABLED, tabs[0].id);
+		update_gpass_icon((enabled)?GPASS_ICON.NORMAL:GPASS_ICON.DISABLED, tabs[0].id);
 		sendResponse({"enabled":enabled});
 	    }
 	);
diff --git a/chrome_addon/lib/main.js b/chrome_addon/lib/main.js
index 3f4cf33..29e8143 100644
--- a/chrome_addon/lib/main.js
+++ b/chrome_addon/lib/main.js
@@ -295,8 +295,6 @@ function unblock_all_forms()
 {
     debug("unblock all forms");
 
-    on_blur(null);
-    
     for(var i=0; i<managed_forms.length; i++)
     {
 	var form = managed_forms[i];