diff --git a/views/message.handlebars b/views/message.handlebars
index 37995a4b..425bc5e3 100644
--- a/views/message.handlebars
+++ b/views/message.handlebars
@@ -79,7 +79,11 @@
             case 10: { msg = "ERROR: Invalid account check, verification url is only valid for 30 minutes."; break; }
             case 11: { msg = "Sharing link not valid yet."; break; }
             case 12: { msg = "Sharing link is expired."; break; }
-            case 13: { msg = "If you are an administrator, [login here].".replace('[', '<a href=login?loginscreen=1>').replace(']', '</a>'); break; }
+            case 13: { 
+                var loginUrl = 'login?loginscreen=1' + (urlargs.key ? '&key=' + urlargs.key : '');
+                msg = "If you are an administrator, [login here].".replace('[', '<a href=' + loginUrl + '>').replace(']', '</a>'); 
+                break; 
+            }
             case 14: { msg = '<a href=' + window.location.href + '&confirm=1>' + "Click here to reset your account password." + '</a>'; break; }
         }
 
diff --git a/views/message2.handlebars b/views/message2.handlebars
index 2b6b1f07..ab208a2b 100644
--- a/views/message2.handlebars
+++ b/views/message2.handlebars
@@ -80,7 +80,11 @@
             case 10: { msg = "ERROR: Invalid account check, verification url is only valid for 30 minutes."; break; }
             case 11: { msg = "Sharing link not valid yet."; break; }
             case 12: { msg = "Sharing link is expired."; break; }
-            case 13: { msg = "If you are an administrator, [login here].".replace('[', '<a href=?loginscreen=1>').replace(']', '</a>'); break; }
+            case 13: { 
+                var loginUrl = '?loginscreen=1' + (urlargs.key ? '&key=' + urlargs.key : '');
+                msg = "If you are an administrator, [login here].".replace('[', '<a href=' + loginUrl + '>').replace(']', '</a>'); 
+                break; 
+            }
             case 14: { msg = '<a href=' + window.location.href + '&confirm=1>' + "Click here to reset your account password." + '</a>'; break; }
         }