diff --git a/php/federator/dio/user.php b/php/federator/dio/user.php
index 38d1cfe..e435683 100644
--- a/php/federator/dio/user.php
+++ b/php/federator/dio/user.php
@@ -209,12 +209,10 @@ class User
             $ruser = $connector->getRemoteUserByName($_name);
             if ($ruser !== false) {
                 $user = $ruser;
+                self::addLocalUser($dbh, $user, $_name);
             }
         }
         if ($cache !== null) {
-            if ($user->id === null && $user->externalid !== null) {
-                self::addLocalUser($dbh, $user, $_name);
-            }
             $cache->saveRemoteUserByName($_name, $user);
         }
         return $user;