diff --git a/lib/Alchemy/Phrasea/Controller/Root/LoginController.php b/lib/Alchemy/Phrasea/Controller/Root/LoginController.php
index 37b5f8338b..ecb65abc47 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/LoginController.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/LoginController.php
@@ -552,6 +552,7 @@ class LoginController extends Controller
         } while (null !== $this->getUserRepository()->findOneBy(['login' => $login]));
 
         $user = $this->getUserManipulator()->createUser($login, $this->getStringGenerator()->generateString(128));
+        $user->setGuest(true);
         $invite_user = $this->getUserRepository()->findByLogin(User::USER_GUEST);
 
         $usr_base_ids = array_keys($this->getAclForUser($user)->get_granted_base());
diff --git a/lib/Alchemy/Phrasea/Helper/User/Manage.php b/lib/Alchemy/Phrasea/Helper/User/Manage.php
index 980c484a90..b0f142fbc4 100644
--- a/lib/Alchemy/Phrasea/Helper/User/Manage.php
+++ b/lib/Alchemy/Phrasea/Helper/User/Manage.php
@@ -91,7 +91,7 @@ class Manage extends Helper
             'sbas_id' => $this->request->get('sbas_id'),
             'base_id' => $this->request->get('base_id'),
             'last_model' => $this->request->get('last_model'),
-            'show_special_users' => $this->request->get('show_special_users') ? true : false,
+            'filter_guest_user' => $this->request->get('filter_guest_user') ? true : false,
             'srt' => $this->request->get("srt", \User_Query::SORT_CREATIONDATE),
             'ord' => $this->request->get("ord", \User_Query::ORD_DESC),
             'per_page' => $results_quantity,
@@ -110,7 +110,7 @@ class Manage extends Helper
             ->last_model_is($this->query_parms['last_model'])
             ->get_inactives($this->query_parms['inactives'])
             ->include_templates(true)
-            ->include_special_users($this->query_parms['show_special_users'])
+            ->include_invite($this->query_parms['filter_guest_user'])
             ->on_bases_where_i_am($this->app->getAclForUser($this->app->getAuthenticatedUser()), [\ACL::CANADMIN])
             ->limit($offset_start, $results_quantity)
             ->execute();
diff --git a/lib/classes/User/Query.php b/lib/classes/User/Query.php
index 4cbcec3c9c..3cfb5749b1 100644
--- a/lib/classes/User/Query.php
+++ b/lib/classes/User/Query.php
@@ -812,7 +812,7 @@ class User_Query
                 WHERE 1 ';
 
         if (! $this->include_special_users) {
-            $sql .= ' AND Users.login != "autoregister" AND Users.login NOT LIKE "guest%" ';
+            $sql .= ' AND Users.login != "autoregister"';
         }
 
         $sql .= ' AND Users.deleted="0" ';
diff --git a/templates/web/admin/users.html.twig b/templates/web/admin/users.html.twig
index 68c646751f..fdc0dca83e 100644
--- a/templates/web/admin/users.html.twig
+++ b/templates/web/admin/users.html.twig
@@ -35,7 +35,7 @@
             <fieldset class="admin_head_opts">
                 <span class="checkbox">
                     {{ 'admin::userlist: filterguestuser' | trans }}
-                    <input type="checkbox"  name="show_special_users" {% if parm['show_special_users'] %} checked="checked" {% endif %} style="margin-left:10px" />
+                    <input type="checkbox"  name="filter_guest_user" {% if parm['filter_guest_user'] %} checked="checked" {% endif %} style="margin-left:10px" />
                 </span>
                 <br/>
                 <span>{{ 'Filter' | trans }}</span>