diff --git a/chrome_addon/background.js b/chrome_addon/background.js
index 86bb22d..3ae7497 100644
--- a/chrome_addon/background.js
+++ b/chrome_addon/background.js
@@ -376,9 +376,9 @@ function createMenus(browser)
     
     /* Not supported by Chrome */
     if (browser.menus.onShown)
-	title = 'Disable gPass for this website';
+	title = 'Disable form\'s hook for this website';
     else
-	title = 'Disable or enable gPass for this website';
+	title = 'Disable or enable form\'s hook for this website';
     
     /* Enable/disable */
     browser.menus.create({
@@ -389,9 +389,9 @@ function createMenus(browser)
 
     /* Not supported by Chrome */
     if (browser.menus.onShown)
-	title = 'Disable gPass for ALL websites';
+	title = 'Disable form\'s hook for ALL websites';
     else
-	title = 'Disable or enable gPass for ALL websites';
+	title = 'Disable or enable form\'s hook for ALL websites';
     
     /* Always enable/disable */
     browser.menus.create({
diff --git a/chrome_addon/lib/main.js b/chrome_addon/lib/main.js
index bac768f..7449b13 100644
--- a/chrome_addon/lib/main.js
+++ b/chrome_addon/lib/main.js
@@ -219,7 +219,8 @@ function on_sumbit(e)
     if (!password_computed)
     {
 	debug("No password computed");
-	form.submit();
+        if (form.submit)
+	    form.submit();
     }
 
     return true;
@@ -242,7 +243,8 @@ function set_password(form, field, password, do_submit)
 	evt.which = 13;
 	field.dispatchEvent(evt);
 	// Submit form
-	form.submit();
+        if (form.submit)
+	    form.submit();
     }
 }
 
diff --git a/chrome_addon/manifest.json b/chrome_addon/manifest.json
index c72b613..b30eefb 100644
--- a/chrome_addon/manifest.json
+++ b/chrome_addon/manifest.json
@@ -3,11 +3,11 @@
 
     "name": "gPass",
     "short_name": "gPass",
-    "version": "1.2",
+    "version": "1.3",
     "description": "gPass : global password manager",
     "icons" : {"16":"icons/gpass_icon_16.png", "32":"icons/gpass_icon_32.png", "64":"icons/gpass_icon_64.png", "128":"icons/gpass_icon_128.png"},
     "author" : "Grégory Soutadé",
-    "homepage_url" : "http://indefero.soutade.fr/p/gpass",
+    "homepage_url" : "https://forge.soutade.fr/soutade/gPass",
 
     "content_scripts": [
 	{
diff --git a/chrome_addon/popup/popup.js b/chrome_addon/popup/popup.js
index 3373037..be3a988 100644
--- a/chrome_addon/popup/popup.js
+++ b/chrome_addon/popup/popup.js
@@ -180,7 +180,6 @@ function _query_tabs_init(tabs)
     				    url += '&user=' + document.getElementById("gPassUsername").value;
     				    var link = document.getElementById("serverLink");
     				    link.href = url;
-				    
     				    return true;
     			        });
 
diff --git a/firefox_webextension/background.js b/firefox_webextension/background.js
index 1b044b7..7d452d6 100644
--- a/firefox_webextension/background.js
+++ b/firefox_webextension/background.js
@@ -27,10 +27,10 @@ function _notification(message, data)
 	message += data;
 
     options = {
-	type: "basic",
-	title : "gPass",
+	type:     "basic",
+	title :   "gPass",
 	message : message,
-	iconUrl:browser.extension.getURL("icons/gpass_icon_64.png")
+	iconUrl:  browser.runtime.getURL("icons/gpass_icon_64.png")
     };
 
     browser.notifications.create("gPass", options, function(){});
diff --git a/firefox_webextension/lib/main.js b/firefox_webextension/lib/main.js
index 29e8143..7f5cd53 100644
--- a/firefox_webextension/lib/main.js
+++ b/firefox_webextension/lib/main.js
@@ -25,10 +25,10 @@ function _notification(message, data)
 	message += data;
 
     options = {
-	type: "basic",
-	title : "gPass",
+	type:     "basic",
+	title :   "gPass",
 	message : message,
-	iconUrl:browser.extension.getURL("icons/gpass_icon_64.png")
+	iconUrl:  browser.runtime.getURL("icons/gpass_icon_64.png")
     };
 
     browser.notifications.create(options).then(
diff --git a/firefox_webextension/manifest.json b/firefox_webextension/manifest.json
index fb78e18..a6a1268 100644
--- a/firefox_webextension/manifest.json
+++ b/firefox_webextension/manifest.json
@@ -3,11 +3,11 @@
 
     "name": "gPass",
     "short_name": "gPass",
-    "version": "1.1",
+    "version": "1.3",
     "description": "gPass : global password manager",
     "icons" : {"16":"icons/gpass_icon_16.png", "32":"icons/gpass_icon_32.png", "64":"icons/gpass_icon_64.png", "128":"icons/gpass_icon_128.png"},
     "author" : "Grégory Soutadé",
-    "homepage_url" : "http://indefero.soutade.fr/p/gpass",
+    "homepage_url" : "https://forge.soutade.fr/soutade/gPass",
 
     "content_scripts": [
 	{