diff --git a/chrome_addon/lib/main.js b/chrome_addon/lib/main.js
index f599678..26af3ee 100644
--- a/chrome_addon/lib/main.js
+++ b/chrome_addon/lib/main.js
@@ -265,6 +265,48 @@ function wildcard_domain(domain)
     return "";
 }
 
+function _add_name(logins, name)
+{
+    for(var i=0; i<logins.length; i++)
+	if (logins[i] == name) return ;
+    logins.push(name);
+}
+
+function try_get_name(fields, type_filters, match)
+{
+    var user = null;
+    var all_logins = new Array();
+
+    for (var i=0; i<fields.length; i++)
+    {
+	var field = fields[i];
+
+	for (var a=0; a<type_filters.length; a++)
+	{
+	    if ((match && field.getAttribute("type") == type_filters[a]) ||
+		(!match && field.getAttribute("type") != type_filters[a]))
+	    {
+		if (field.hasAttribute("name") && field.value != "")
+		{
+		    name = field.getAttribute("name");
+		    // Subset of common user field
+		    if      (name == "user")     user = field.value;
+		    else if (name == "usr")      user = field.value;
+		    else if (name == "username") user = field.value;
+		    else if (name == "login")    user = field.value;
+
+		    _add_name(all_logins, field.value);
+		}
+	    }
+	}
+    }
+
+    if (user != null)
+	return new Array(user);
+    else
+	return all_logins;
+}
+
 function on_sumbit(e)
 {
     var form = this;
@@ -279,32 +321,18 @@ function on_sumbit(e)
 
     debug("salt " + salt);
 
-    var user = null;
-    var all_logins = new Array();
-
+    type_filters = new Array();
     // Get all <input type="text"> && <input type="email">
-    for (var i=0; i<fields.length; i++)
-    {
-	var field = fields[i];
-	if (field.getAttribute("type") == "text" || field.getAttribute("type") == "email")
-	{
-	    if (field.hasAttribute("name") && field.value != "")
-	    {
-		name = field.getAttribute("name");
-		// Subset of common user field
-		if      (name == "user")     user = field.value;
-		else if (name == "usr")      user = field.value;
-		else if (name == "username") user = field.value;
-		else if (name == "login")    user = field.value;
-		all_logins.push(field.value);
-	    }
-	}
-    }
+    type_filters.push("text");
+    type_filters.push("email");
+    logins = try_get_name(fields, type_filters, true);
 
-    if (user != null)
-	logins = new Array(user);
-    else
-	logins = all_logins;
+    // Get all other fields except text, email and password
+    if (!logins.length)
+    {
+	type_filters.push("password");
+	logins = try_get_name(fields, type_filters, false);
+    }
 
     // Look for <input type="password" value="@@...">
     for (var i=0; i<fields.length; i++)
diff --git a/chrome_addon/manifest.json b/chrome_addon/manifest.json
index eeb1c35..442db8d 100644
--- a/chrome_addon/manifest.json
+++ b/chrome_addon/manifest.json
@@ -3,7 +3,7 @@
 
     "name": "gPass",
     "short_name": "gPass",
-    "version": "0.6.1",
+    "version": "0.7",
     "description": "gPass : global password manager",
     "icons" : {"16":"gpass_icon_16.png", "32":"gpass_icon_32.png", "64":"gpass_icon_64.png", "128":"gpass_icon_128.png"},
     "author" : "Grégory Soutadé",
diff --git a/firefox_addon/lib/main.js b/firefox_addon/lib/main.js
index c757a97..c4bcb1e 100644
--- a/firefox_addon/lib/main.js
+++ b/firefox_addon/lib/main.js
@@ -22,9 +22,9 @@ var notifications = require("sdk/notifications");
 var self = require("sdk/self");
 var prefSet = require("sdk/simple-prefs");
 
-var pkdbf2 = require("pkdbf2").pkdbf2;
-var aes = require("jsaes").aes;
-var parseURI = require("parseuri").parseURI;
+var pkdbf2 = require("lib/pkdbf2").pkdbf2;
+var aes = require("lib/jsaes").aes;
+var parseURI = require("lib/parseuri").parseURI;
 var DEBUG = false;
 var pkdbf2_level = getPref("pkdbf2_level");
 var protocol_version = 3;
@@ -272,6 +272,48 @@ function wildcard_domain(domain)
     return "";
 }
 
+function _add_name(logins, name)
+{
+    for(var i=0; i<logins.length; i++)
+	if (logins[i] == name) return ;
+    logins.push(name);
+}
+
+function try_get_name(fields, type_filters, match)
+{
+    var user = null;
+    var all_logins = new Array();
+
+    for (var i=0; i<fields.length; i++)
+    {
+	var field = fields[i];
+
+	for (var a=0; a<type_filters.length; a++)
+	{
+	    if ((match && field.getAttribute("type") == type_filters[a]) ||
+		(!match && field.getAttribute("type") != type_filters[a]))
+	    {
+		if (field.hasAttribute("name") && field.value != "")
+		{
+		    name = field.getAttribute("name");
+		    // Subset of common user field
+		    if      (name == "user")     user = field.value;
+		    else if (name == "usr")      user = field.value;
+		    else if (name == "username") user = field.value;
+		    else if (name == "login")    user = field.value;
+
+		    _add_name(all_logins, field.value);
+		}
+	    }
+	}
+    }
+
+    if (user != null)
+	return new Array(user);
+    else
+	return all_logins;
+}
+
 function on_sumbit(e)
 {
     var form = this;
@@ -286,32 +328,18 @@ function on_sumbit(e)
 
     debug("salt " + salt);
 
-    var user = null;
-    var all_logins = new Array();
-
+    type_filters = new Array();
     // Get all <input type="text"> && <input type="email">
-    for (var i=0; i<fields.length; i++)
-    {
-	var field = fields[i];
-	if (field.getAttribute("type") == "text" || field.getAttribute("type") == "email")
-	{
-	    if (field.hasAttribute("name") && field.value != "")
-	    {
-		name = field.getAttribute("name");
-		// Subset of common user field
-		if      (name == "user")     user = field.value;
-		else if (name == "usr")      user = field.value;
-		else if (name == "username") user = field.value;
-		else if (name == "login")    user = field.value;
-		all_logins.push(field.value);
-	    }
-	}
-    }
+    type_filters.push("text");
+    type_filters.push("email");
+    logins = try_get_name(fields, type_filters, true);
 
-    if (user != null)
-	logins = new Array(user);
-    else
-	logins = all_logins;
+    // Get all other fields except text, email and password
+    if (!logins.length)
+    {
+	type_filters.push("password");
+	logins = try_get_name(fields, type_filters, false);
+    }
 
     // Look for <input type="password" value="@@...">
     for (var i=0; i<fields.length; i++)
diff --git a/firefox_addon/lib/pkdbf2.js b/firefox_addon/lib/pkdbf2.js
index a7a9363..473610b 100644
--- a/firefox_addon/lib/pkdbf2.js
+++ b/firefox_addon/lib/pkdbf2.js
@@ -17,7 +17,7 @@
   along with gPass.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-var hmac = require("hmac").hmac;
+var hmac = require("lib/hmac").hmac;
 
 exports.pkdbf2 = {
     
diff --git a/firefox_addon/package.json b/firefox_addon/package.json
index c6d57b8..46f5197 100644
--- a/firefox_addon/package.json
+++ b/firefox_addon/package.json
@@ -1,13 +1,14 @@
 {
   "name": "gpass",
   "fullName": "gPass",
-  "id": "jid1-eNs887pPJU8aNg",
+  "id": "jid1-eNs887pPJU8aNg@jetpack",
+  "main": "lib/main.js",
   "description": "gPass : global password manager",
   "author": "Grégory Soutadé",
   "license": "GNU GPL v3",
     "homepage" : "http://indefero.soutade.fr/p/gpass",
     "icon" : "data/gpass_icon_64.png",
-    "version": "0.6",
+    "version": "0.7.0",
     "preferences": [
     {
         "name": "account_url",