diff --git a/include/client/header.inc.php b/include/client/header.inc.php
index e6ea209f4048ee21b92244bfc0e504e82a89c8fa..65ce264996fc81d02d14220f68b7a862fe0c14e1 100644
--- a/include/client/header.inc.php
+++ b/include/client/header.inc.php
@@ -1,5 +1,7 @@
<?php
$title=($cfg && is_object($cfg) && $cfg->getTitle())?$cfg->getTitle():'osTicket :: Support Ticket System';
+$signin_url = ROOT_PATH . "login.php"
+ . ($thisclient ? "?e=".urlencode($thisclient->getEmail()) : "");
header("Content-Type: text/html; charset=UTF-8\r\n");
?>
<!DOCTYPE html>
@@ -56,7 +58,7 @@ header("Content-Type: text/html; charset=UTF-8\r\n");
Guest User | <?php
}
if ($cfg->getClientRegistrationMode() != 'disabled') { ?>
- <a href="<?php echo ROOT_PATH; ?>login.php">Sign In</a>
+ <a href="<?php echo $signin_url; ?>">Sign In</a>
<?php
}
} ?>
diff --git a/include/client/view.inc.php b/include/client/view.inc.php
index 02e72f4b0d60caee5d13a6b6fa8a4d3481cbd047..cf7d5ea258b09dfccb7076fcfba0f2fa6744a92c 100644
--- a/include/client/view.inc.php
+++ b/include/client/view.inc.php
@@ -14,7 +14,9 @@ if ($thisclient && $thisclient->isGuest()
<div id="msg_info">
<i class="icon-compass icon-2x pull-left"></i>
<strong>Looking for your other tickets?</strong></br>
- <a href="login.php" style="text-decoration:underline">Sign in</a> or
+ <a href="<?php echo ROOT_PATH; ?>login.php?e=<?php
+ echo urlencode($thisclient->getEmail());
+ ?>" style="text-decoration:underline">Sign in</a> or
<a href="account.php?do=create" style="text-decoration:underline">register for an account</a>
for the best experience on our help desk.</div>
diff --git a/js/osticket.js b/js/osticket.js
index e3089ab2b25ab18b81439d2253715ee94793073d..f5fa852e84f5a3fc7ca372c0c37b1be9e0c99691 100644
--- a/js/osticket.js
+++ b/js/osticket.js
@@ -5,7 +5,7 @@
$(document).ready(function(){
- $("input:not(.dp):visible:enabled:first").focus();
+ $('input:not(.dp):visible:enabled:input[value=""]:first').focus();
$('table.list tbody tr:odd').addClass('odd');
//Overlay