diff --git a/server/resources/gpass.js b/server/resources/gpass.js
index 8415ea9..ed00979 100755
--- a/server/resources/gpass.js
+++ b/server/resources/gpass.js
@@ -782,7 +782,8 @@ function delete_entry(entry_number)
     var found = -1;
     for(i=0; i<passwords.length; i++)
     {
-	if (passwords[i].ciphered_login == ciphered_login.getAttribute("login"))
+	if (passwords[i].ciphered_login == ciphered_login.getAttribute("login") ||
+	    passwords[i].shadow_login == ciphered_login.getAttribute("login"))
 	{
 	    found = i;
 	    break;
@@ -916,6 +917,9 @@ async function update_masterkey()
 		break;
 	    }
 
+	    if (use_shadow_logins)
+		await passwords[i].generate_access_token(current_mkey);
+	    
 	    global_iv = new_global_iv;
 	    await passwords[i].encrypt(current_mkey);
 	    ok = add_password_server(current_user, passwords[i]);