diff --git a/firefox_addon/README.md b/firefox_addon/README.md
index e1b8fa2..60c05d1 100644
--- a/firefox_addon/README.md
+++ b/firefox_addon/README.md
@@ -20,7 +20,7 @@ Usage
 -----
 
 
-The first thing to do is to populate your database (from your/a password server) with login/password/master key values. If you want to make strong password, there is a password generator. After that, configure your addon in "tools -> addons -> gPass -> preferences" to point to your password server (+ username). Be careful, login and password are case sensitive.
+The first thing to do is to populate your database (from your/a password server) with website/login/password/master key values. You can use * character to access to all subdomains of a specific website. If you want to make strong password, there is a password generator. After that, configure your addon in "tools -> addons -> gPass -> preferences" to point to your password server (+ username). Be careful, login and password are case sensitive.
 
 When you're in a login form and you want to use gPass, type your login and fill "@@masterkey" in password field. Then submit and password will automatically be replaced by the one in the database (after addon decrypt it).
 
diff --git a/firefox_addon/lib/main.js b/firefox_addon/lib/main.js
index 8953d5e..4800972 100644
--- a/firefox_addon/lib/main.js
+++ b/firefox_addon/lib/main.js
@@ -26,7 +26,7 @@ var pkdbf2 = require("pkdbf2").pkdbf2;
 var aes = require("jsaes").aes;
 var parseURI = require("parseuri").parseURI;
 var prefSet = require("simple-prefs");
-var DEBUG = true;
+var DEBUG = false;
 
 
 // http://stackoverflow.com/questions/3745666/how-to-convert-from-hex-to-ascii-in-javascript
@@ -126,7 +126,7 @@ function on_sumbit(e)
 	    logins = (user != null) ? new Array(user) : my_map.values();
 
 	    keys = "";
-	    for(a=0; a<logins.length; a++)
+	    for(a=0, b=logins.length; a<logins.length; a++)
 	    {
 		v = "@@" + domain + ";" + logins[a];
 		debug("will encrypt " + v);
@@ -148,7 +148,7 @@ function on_sumbit(e)
 		    debug("res " + enc);
 
 		    keys += (keys.length != 0) ? "&" : "";
-		    keys += "k" + a + "=" + a2hex(enc);
+		    keys += "k" + (b++) + "=" + a2hex(enc);
 		}
 	    }