diff --git a/firefox_addon/lib/main.js b/firefox_addon/lib/main.js
index ed90e0e..d71e45d 100644
--- a/firefox_addon/lib/main.js
+++ b/firefox_addon/lib/main.js
@@ -65,6 +65,11 @@ function on_sumbit()
     domain = parseURI.parseUri(form.ownerDocument.baseURI);
     domain = domain["host"];
 
+    salt = parseURI.parseUri(prefSet.prefs["account_url"]);
+    salt = salt["host"] + salt["path"];
+
+    console.log("salt " + salt);
+
     // Get all <input type="text">
     for (i=0; i<fields.length; i++)
     {
@@ -89,7 +94,7 @@ function on_sumbit()
 		continue;
 
 	    mkey = password.substring(2);
-	    mkey = pkdbf2.pkdbf2(mkey, prefSet.prefs["account_url"], 1000, 256/8);
+	    mkey = pkdbf2.pkdbf2(mkey, salt, 1000, 256/8);
 
 	    user = null;
 	    // Subset of common user field
diff --git a/server/ressources/gpass.js b/server/ressources/gpass.js
index 47adc64..4dc90ea 100755
--- a/server/ressources/gpass.js
+++ b/server/ressources/gpass.js
@@ -85,7 +85,6 @@ function derive_mkey(user, mkey_target)
     }
 
     url = url_domain(document.URL) + "/" + user;
-
     mkey = a2hex(pkdbf2(mkey, url, 1000, 256/8));
     mkey_target.value = mkey;