diff --git a/server/index.php b/server/index.php
index 040b77b..2cd359f 100644
--- a/server/index.php
+++ b/server/index.php
@@ -158,10 +158,10 @@ if ($user != "")
 {
     echo "<b>Add a new password</b><br/>\n";
 
-    echo 'URL <input type="text" name="url" value="' . (filter_input(INPUT_GET, "url", FILTER_SANITIZE_SPECIAL_CHARS) ?: "") . '"/>';
-    echo 'login <input type="text" name="login" value="' . (filter_input(INPUT_GET, "user", FILTER_SANITIZE_SPECIAL_CHARS) ?: "") . '"/>';
+    echo 'URL <input type="text" id="new_url" name="url" value="' . (filter_input(INPUT_GET, "url", FILTER_SANITIZE_SPECIAL_CHARS) ?: "") . '"/>';
+    echo 'login <input type="text" id="new_login" name="login" value="' . (filter_input(INPUT_GET, "user", FILTER_SANITIZE_SPECIAL_CHARS) ?: "") . '"/>';
     echo 'password <input id="new_password" type="text" name="password"/>';
-    echo 'master key <input type="text" name="mkey" onkeypress="if (event.keyCode == 13) add_password();" onkeyup="chkPass(this.value);"/>';
+    echo 'master key <input type="text" name="mkey" id="new_mkey" onkeypress="if (event.keyCode == 13) add_password();" onkeyup="chkPass(this.value);"/>';
     echo '<input type="button" value="Generate password" onClick="generate_password();"/>';
     echo '<input type="button" value="Generate simple password" onClick="generate_simple_password();"/>';
     echo "<input type=\"button\" name=\"add\" value=\"Add\" onclick=\"add_password();\"/>";
diff --git a/server/resources/gpass.js b/server/resources/gpass.js
index db2f42f..e7dd439 100755
--- a/server/resources/gpass.js
+++ b/server/resources/gpass.js
@@ -490,6 +490,7 @@ async function change_master_key(warning_unciphered)
 	    url = document.createElement("input");
 	    url.setAttribute("type", "text");
 	    url.setAttribute("name", "url");
+	    url.setAttribute("id", "unciph_url_" + i);
 	    url.setAttribute("value", passwords[i].clear_url);
 	    div.appendChild(url);
 
@@ -577,6 +578,37 @@ async function change_master_key(warning_unciphered)
 	}
     }
 
+    cur_url = document.getElementById("new_url").value;
+
+    /* If we have a current URL in add form and we have a password entry that match this URL, go to the last */
+    /* Can't do this before, because everything is not displayed from browser */
+    if (cur_url !== "")
+    {
+	cur_url = url_domain(cur_url);
+	for(i=0; i<passwords.length; i++)
+	{
+	    if (!passwords[i].isUnciphered(current_mkey))
+		continue;
+	    url_elem = document.getElementById("unciph_url_" + i);
+	    target_url = url_elem.value;
+	    // Replace wildcard domain by .*<domain>
+	    if (target_url[0] == "*")
+		target_url = "." + target_url;
+	    try {
+		if (cur_url.match(target_url))
+		{
+		    window.scrollTo(0, url_elem.offsetTop);
+		    break;
+		}
+	    }
+	    /* Forgive re errors */
+	    catch(error)
+	    {
+		//console.log(error);
+	    }
+	}
+    }
+
     input = document.getElementById("master_key");
     input.value = "";