diff --git a/include/ajax.users.php b/include/ajax.users.php
index f8b9b78b4ea8a8d7dfc3c3d0a3c67352067e214b..dd01ac1deb8bfb4ea261e20d9da37a33aa18d44a 100644
--- a/include/ajax.users.php
+++ b/include/ajax.users.php
@@ -83,7 +83,7 @@ class UsersAjaxAPI extends AjaxController {
             // Omit already-imported remote users
             if ($emails = array_filter($emails)) {
                 $users->union(User::objects()
-                    ->values_flat('id', 'name', 'emails__address')
+                    ->values_flat('id', 'name', 'default_email__address')
                     ->annotate(array('__relevance__' => new SqlCode(1)))
                     ->filter(array(
                         'emails__address__in' => $emails
@@ -91,7 +91,7 @@ class UsersAjaxAPI extends AjaxController {
             }
 
             foreach ($users as $U) {
-                list($id,$email,$name) = $U;
+                list($id, $name, $email) = $U;
                 foreach ($matches as $i=>$u) {
                     if ($u['email'] == $email) {
                         unset($matches[$i]);
diff --git a/include/class.auth.php b/include/class.auth.php
index a106d6a4c9fa89dce87115dfa7c460b4f19a0903..a924d9cd5a990bc507ba0028014490a5445e732b 100644
--- a/include/class.auth.php
+++ b/include/class.auth.php
@@ -1126,8 +1126,7 @@ class AuthTokenAuthentication extends UserAuthenticationBackend {
 
 }
 
-if ($cfg && $cfg->isAuthTokenEnabled())
-    UserAuthenticationBackend::register('AuthTokenAuthentication');
+UserAuthenticationBackend::register('AuthTokenAuthentication');
 
 //Simple ticket lookup backend used to recover ticket access link.
 // We're using authentication backend so we can guard aganist brute force
diff --git a/include/class.misc.php b/include/class.misc.php
index 0de812b734201d406817aadb952deb508832d1e7..d926200e4ea8c2911c196a5bc83d9b33101d9645 100644
--- a/include/class.misc.php
+++ b/include/class.misc.php
@@ -92,7 +92,10 @@ class Misc {
         if (is_int($timestamp)) {
             $time = $timestamp;
         } else {
-            $date = new DateTime($timestamp, $tz);
+            if (!($date = new DateTime($timestamp, $tz))) {
+                // Timestamp might be invalid
+                return $timestamp;
+            }
             $time = $date->format('U');
         }