diff --git a/include/class.auth.php b/include/class.auth.php
index ebf76b2a85edf0ceb787a4473741cb2a8dcde7ac..dcde257c8ed86d3a83983fbfb4e7ff5f8bc71164 100644
--- a/include/class.auth.php
+++ b/include/class.auth.php
@@ -448,7 +448,7 @@ abstract class UserAuthenticationBackend  extends AuthenticationBackend {
     }
 
     function getAllowedBackends($userid) {
-        $backends = array('authlink');
+        $backends = array('authtoken');
         $sql = 'SELECT A1.backend FROM '.USER_ACCOUNT_TABLE
               .' A1 INNER JOIN '.USER_EMAIL_TABLE.' A2 ON (A2.user_id = A1.user_id)'
               .' WHERE backend IS NOT NULL '
@@ -826,7 +826,6 @@ class AuthTokenAuthentication extends UserAuthenticationBackend {
         return $user;
     }
 
-
     protected function getAuthKey($user) {
 
         if (!$this->supportsAuthentication() || !$user)
diff --git a/include/client/accesslink.inc.php b/include/client/accesslink.inc.php
index 183742d5a6792dac6b9a67ca44d45ed5a0b077fe..0f1ef8c319afb1b388bc0710dd6e4fc30809ceae 100644
--- a/include/client/accesslink.inc.php
+++ b/include/client/accesslink.inc.php
@@ -28,7 +28,7 @@ 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="login.php?do=create">Sign In</a> <?php
+        <a href="account.php?do=create">Sign In</a> <?php
     if ($cfg->isClientRegistrationEnabled()) { ?>
         or <a href="login.php?do=create">register for an account</a> <?php
     } ?> to access all your tickets.
diff --git a/include/client/view.inc.php b/include/client/view.inc.php
index 0ff0dbdea738ab89eaa37a376dc1eff01d280115..27f2bd0845f90a09050801e8bb6763a1ef0840e8 100644
--- a/include/client/view.inc.php
+++ b/include/client/view.inc.php
@@ -14,8 +14,8 @@ 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="account.php?do=create">Register for an account</a>
-    or <a href="login.php">sign in</a>
+    <a href="login.php" 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>
 
 <?php } ?>