diff --git a/assets/default/css/theme.css b/assets/default/css/theme.css
index 8a3ea45df2bd5e24e0af7cd2c37dc186c8a500b4..2166850b3a402f0e4109d62e81034af4e56b8b69 100644
--- a/assets/default/css/theme.css
+++ b/assets/default/css/theme.css
@@ -643,12 +643,8 @@ label.required {
   color: #d00;
   display: block;
 }
-#clientLogin #email {
-  width: 250px;
-  margin-right: 0;
-}
+#clientLogin #email,
 #clientLogin #ticketno {
-  width: 120px;
   margin-right: 0;
 }
 #clientLogin input[type=text],
diff --git a/include/client/accesslink.inc.php b/include/client/accesslink.inc.php
index 0f1ef8c319afb1b388bc0710dd6e4fc30809ceae..a87d08d58767eaa189cba82e5196d2c1698e0624 100644
--- a/include/client/accesslink.inc.php
+++ b/include/client/accesslink.inc.php
@@ -14,12 +14,14 @@ link will be emailed to you.</p>
     <strong><?php echo Format::htmlchars($errors['login']); ?></strong>
     <br>
     <div>
-        <label for="email">E-Mail Address:</label><br/>
-        <input id="email" type="text" name="lemail" size="30" value="<?php echo $email; ?>">
+        <label for="email">E-Mail Address:
+        <input id="email" placeholder="e.g. john.doe@osticket.com" type="text"
+            name="lemail" size="30" value="<?php echo $email; ?>"></label>
     </div>
     <div>
         <label for="ticketno">Ticket Number:</label><br/>
-        <input id="ticketno" type="text" name="lticket" size="16" value="<?php echo $ticketid; ?>"></td>
+        <input id="ticketno" type="text" name="lticket" placeholder="e.g. 051243"
+            size="30" value="<?php echo $ticketid; ?>"></td>
     </div>
     <p>
         <input class="btn" type="submit" value="Email Access Link">
@@ -28,9 +30,9 @@ link will be emailed to you.</p>
     <div style="display:table-cell;padding-left: 2em;padding-right:90px;">
 <?php if ($cfg && $cfg->getClientRegistrationMode() !== 'disabled') { ?>
         Have an account with us?
-        <a href="account.php?do=create">Sign In</a> <?php
+        <a href="login.php">Sign In</a> <?php
     if ($cfg->isClientRegistrationEnabled()) { ?>
-        or <a href="login.php?do=create">register for an account</a> <?php
+        or <a href="account.php?do=create">register for an account</a> <?php
     } ?> to access all your tickets.
 <?php
 } ?>
diff --git a/include/client/login.inc.php b/include/client/login.inc.php
index 2430a77c0abb05fc587e3df388de248b3a543fbb..062e1db7cd7ef443d23b9d1dbd8f422f8a1b730e 100644
--- a/include/client/login.inc.php
+++ b/include/client/login.inc.php
@@ -24,10 +24,10 @@ if ($content) {
     <div style="width:40%;display:table-cell;box-shadow: 12px 0 15px -15px rgba(0,0,0,0.4);padding:15px;">
     <strong><?php echo Format::htmlchars($errors['login']); ?></strong>
     <div>
-        <input id="username" placeholder="username" type="text" name="luser" size="30" value="<?php echo $email; ?>">
+        <input id="username" placeholder="Email or Username" type="text" name="luser" size="30" value="<?php echo $email; ?>">
     </div>
     <div>
-        <input id="passwd" placeholder="password" type="password" name="lpasswd" size="30" value="<?php echo $passwd; ?>"></td>
+        <input id="passwd" placeholder="Password" type="password" name="lpasswd" size="30" value="<?php echo $passwd; ?>"></td>
     </div>
     <p>
         <input class="btn" type="submit" value="Sign In">