diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php b/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php
index e272f119eb..b202679d40 100644
--- a/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php
+++ b/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php
@@ -206,7 +206,7 @@ public function listPublicationAction(PhraseaApplication $app, Request $request)
         if (!$session->has($passSessionName) && $providerId != null) {
             try {
                 $provider = $this->getAuthenticationProviders()->get($providerId);
-                if ($provider->getType() == 'PsAuth') {
+                if ($provider->getType() == 'PsAuth' && $exposeConfiguration['auth_provider_name'] == $providerId) {
 
                     $session->set($passSessionName, ['access_token' => $provider->getAccessToken()]);
                     $session->set($this->getLoginSessionName($exposeName), $provider->getUserName());
diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig
index 0e66372b6a..3d373493b2 100644
--- a/templates/web/prod/WorkZone/Macros.html.twig
+++ b/templates/web/prod/WorkZone/Macros.html.twig
@@ -670,16 +670,11 @@
         <div class="expose-header">
             <div id="expose_sel" class="custom_select_dark" style="padding:10px;">
                 {% set expose_list = app['conf'].get(['phraseanet-service', 'expose-service', 'exposes']) %}
-                {% set providerId = app['session'].get('auth_provider.id') %}
 
                 <select id="expose_list" name="expose_list" class="expose_list">
                     <option value="">{{ 'prod:expose:select expose' | trans }}</option>
                     {% for key in expose_list|keys %}
-                        {% if (
-                            (providerId is not null and expose_list[key].auth_provider_name == providerId)
-                            or providerId is empty)
-                            and expose_list[key].activate_expose  %}
-
+                        {% if expose_list[key].activate_expose  %}
                             <option value="{{ key }}">{{ key }}</option>
                         {% endif %}
                     {% endfor %}