diff --git a/assets/keycloak-fc-conf-provider.PNG b/assets/keycloak-fc-conf-provider.PNG
index 0fd8443..88ca112 100644
Binary files a/assets/keycloak-fc-conf-provider.PNG and b/assets/keycloak-fc-conf-provider.PNG differ
diff --git a/src/main/resources/theme-resources/messages/admin-messages_en.properties b/src/main/resources/theme-resources/messages/admin-messages_en.properties
index 2d3a8dc..00c3098 100644
--- a/src/main/resources/theme-resources/messages/admin-messages_en.properties
+++ b/src/main/resources/theme-resources/messages/admin-messages_en.properties
@@ -5,6 +5,12 @@ franceconnect.acr_values.eidas2=eidas2 : significant level (example : two factor
 franceconnect.acr_values.eidas3=eidas3 : strong level  (example : authentication with smartcard, USB Token, ... eIDAS compliant)
 franceconnect.acr_values.tooltip=Select the user account warranty level. Effect : disabling lower level identity providers on FranceConnect login page.
 
+franceconnect.config.advanced=Advanced configuration
+franceconnect.config.advanced.tooltip=Advanced settings for tuning Keycloak and/or OpenID Connect.
+
+franceconnect.logout.ignorstateparam=Ignore Absent State Parameter on logout
+franceconnect.logout.ignorstateparam.tooltip=Enable to avoid errors when FranceConnect doesn''t return the sate parameter on logout
+
 franceconnect.account.managment.link=Manage my FranceConnect Account
 
 franceconnect.scopes.supported=List of FranceConnect supported scopes
diff --git a/src/main/resources/theme-resources/messages/admin-messages_fr.properties b/src/main/resources/theme-resources/messages/admin-messages_fr.properties
index 2abbe60..0520821 100644
--- a/src/main/resources/theme-resources/messages/admin-messages_fr.properties
+++ b/src/main/resources/theme-resources/messages/admin-messages_fr.properties
@@ -4,7 +4,13 @@ franceconnect.acr_values.eidas1=eidas 1 : niveau standard (exemple : authentific
 franceconnect.acr_values.eidas2=eidas 2 : niveau substantiel (exemple : second facteur. Homologué eIDAS)
 franceconnect.acr_values.eidas3=eidas 3 : niveau élevé (exemple : utilisation de certificats, lecteurs de cartes, ... Homologué eIDAS)
 franceconnect.acr_values.tooltip=Permet de fixer le niveau de garantie du compte utilisateur souhaité. Effet : désactive des fournisseurs d'identités (FI) sur la page de login FranceConnect.
-    
+
+franceconnect.config.advanced=Configuration Avancée
+franceconnect.config.advanced.tooltip=Paramètres de configuration avancée proposés par Keycloak et OpenID Connect
+
+franceconnect.logout.ignorstateparam=Ignorer le paramètre State sur le logout
+franceconnect.logout.ignorstateparam.tooltip=Enable to avoid errors when FranceConnect doesn''t return the sate parameter on logout
+
 franceconnect.account.managment.link=Gérer mon espace FS FranceConnect
 
 franceconnect.scopes.supported=Consulter les scopes proposés par FranceConnect
diff --git a/src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier-test.html b/src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier-test.html
index 59c48fa..bb25e82 100644
--- a/src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier-test.html
+++ b/src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier-test.html
@@ -17,8 +17,6 @@
                 </div>
                 <kc-tooltip>{{:: 'redirect-uri.tooltip' | translate}}</kc-tooltip>
             </div>
-        </fieldset>
-        <fieldset>
             <div class="form-group clearfix">
                 <label class="col-md-2 control-label" for="identifier"><span class="required">*</span> {{:: 'alias' | translate}}</label>
                 <div class="col-md-6">
@@ -33,13 +31,66 @@
                 </div>
                 <kc-tooltip>{{:: 'identity-provider.display-name.tooltip' | translate}}</kc-tooltip>
             </div>
+            <div class="form-group clearfix">
+                <label class="col-md-2 control-label" for="clientId"><span class="required">*</span> {{:: 'client-id' | translate}}</label>
+                <div class="col-md-6">
+                    <input class="form-control" id="clientId" type="text" ng-model="identityProvider.config.clientId" required>
+                </div>
+                <div class="col-sm-4">
+                    <a target="_blank" rel="noopener noreferrer" href="https://partenaires.franceconnect.gouv.fr/monprojet/cadrage/">{{:: 'franceconnect.account.managment.link' | translate}}</a>
+                </div>
+                <kc-tooltip>{{:: 'identity-provider.client-id.tooltip' | translate}}</kc-tooltip>
+            </div>
+            <div class="form-group clearfix">
+                <label class="col-md-2 control-label" for="clientSecret"><span class="required">*</span> {{:: 'client-secret' | translate}}</label>
+                <div class="col-md-6">
+                    <input class="form-control" id="clientSecret" kc-password ng-model="identityProvider.config.clientSecret" required>
+                </div>
+                <kc-tooltip>{{:: 'client-secret.tooltip' | translate}}</kc-tooltip>
+            </div>
+            <div class="form-group clearfix">
+                    <label class="col-md-2 control-label" for="defaultScope">{{:: 'default-scopes' | translate}} </label>
+                    <div class="col-md-6">
+                        <input class="form-control" id="defaultScope" type="text" ng-model="identityProvider.config.defaultScope">
+                    </div>
+                    <div class="col-sm-4">
+                        <a target="_blank" rel="noopener noreferrer" href="https://partenaires.franceconnect.gouv.fr/fcp/fournisseur-service#identite_pivot">{{:: 'franceconnect.scopes.supported' | translate}}</a>
+                    </div>
+                    <kc-tooltip>{{:: 'identity-provider.default-scopes.tooltip' | translate}}</kc-tooltip>
+            </div>
             <div class="form-group">
-                <label class="col-md-2 control-label" for="enabled">{{:: 'enabled' | translate}}</label>
+                <label class="col-md-2 control-label" for="acrValues">{{:: 'franceconnect.acr_values' | translate}}</label>
+                <div class="col-md-6">
+                    <div>
+                        <select class="form-control" id="acrValues" ng-model="identityProvider.config.acr_values">
+                            <option value="eidas1">{{:: 'franceconnect.acr_values.eidas1' | translate}}</option>
+                            <option value="eidas2">{{:: 'franceconnect.acr_values.eidas2' | translate}}</option>
+                            <option value="eidas3">{{:: 'franceconnect.acr_values.eidas3' | translate}}</option>
+                        </select>
+                    </div>
+                </div>
+                <kc-tooltip>{{:: 'franceconnect.acr_values.tooltip' | translate}}</kc-tooltip>
+            </div>
+            <div class="form-group">
+                    <label class="col-md-2 control-label" for="enabled">{{:: 'enabled' | translate}}</label>
+                    <div class="col-md-6">
+                        <input ng-model="identityProvider.enabled" id="enabled" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                    </div>
+                    <kc-tooltip>{{:: 'identity-provider.enabled.tooltip' | translate}}</kc-tooltip>
+                </div>    
+            <div class="form-group">
+                <label class="col-md-2 control-label" for="trustEmail">{{:: 'trust-email' | translate}}</label>
                 <div class="col-md-6">
-                    <input ng-model="identityProvider.enabled" id="enabled" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                    <input ng-model="identityProvider.trustEmail" name="identityProvider.trustEmail" id="trustEmail" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
                 </div>
-                <kc-tooltip>{{:: 'identity-provider.enabled.tooltip' | translate}}</kc-tooltip>
+                <kc-tooltip>{{:: 'trust-email.tooltip' | translate}}</kc-tooltip>
             </div>
+            
+        </fieldset>
+
+        <fieldset>
+            <legend collapsed><span class="text">{{:: 'franceconnect.config.advanced' | translate}}</span> <kc-tooltip>{{:: 'franceconnect.config.advanced.tooltip' | translate}}</kc-tooltip></legend>
+
             <div class="form-group">
                 <label class="col-md-2 control-label" for="storeToken">{{:: 'store-tokens' | translate}}</label>
                 <div class="col-md-6">
@@ -54,13 +105,6 @@
                 </div>
                 <kc-tooltip>{{:: 'identity-provider.stored-tokens-readable.tooltip' | translate}}</kc-tooltip>
             </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="trustEmail">{{:: 'trust-email' | translate}}</label>
-                <div class="col-md-6">
-                    <input ng-model="identityProvider.trustEmail" name="identityProvider.trustEmail" id="trustEmail" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
-                </div>
-                <kc-tooltip>{{:: 'trust-email.tooltip' | translate}}</kc-tooltip>
-            </div>
             <div class="form-group">
                 <label class="col-md-2 control-label" for="linkOnly">{{:: 'link-only' | translate}}</label>
                 <div class="col-md-6">
@@ -107,9 +151,6 @@
                 </div>
                 <kc-tooltip>{{:: 'post-broker-login-flow.tooltip' | translate}}</kc-tooltip>
             </div>
-        </fieldset>
-        <fieldset>
-            <legend uncollapsed><span class="text">{{:: 'openid-connect-config' | translate}}</span> <kc-tooltip>{{:: 'openid-connect-config.tooltip' | translate}}</kc-tooltip></legend>
            
             <div class="form-group">
                 <label class="col-sm-2 control-label" for="loginHint">{{:: 'loginHint' | translate}}</label>
@@ -125,43 +166,7 @@
                 </div>
                 <kc-tooltip>{{:: 'uiLocales.tooltip' | translate}}</kc-tooltip>
             </div>
-            <div class="form-group clearfix">
-                <label class="col-md-2 control-label" for="clientId"><span class="required">*</span> {{:: 'client-id' | translate}}</label>
-                <div class="col-md-6">
-                    <input class="form-control" id="clientId" type="text" ng-model="identityProvider.config.clientId" required>
-                    <a href="https://partenaires.franceconnect.gouv.fr/monprojet/cadrage/" target="_blank" rel="noopener noreferrer">{{:: 'franceconnect.account.managment.link' | translate}}</a>
-                </div>
-                <kc-tooltip>{{:: 'identity-provider.client-id.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group clearfix">
-                <label class="col-md-2 control-label" for="clientSecret"><span class="required">*</span> {{:: 'client-secret' | translate}}</label>
-                <div class="col-md-6">
-                    <input class="form-control" id="clientSecret" kc-password ng-model="identityProvider.config.clientSecret" required>
-                </div>
-                <kc-tooltip>{{:: 'client-secret.tooltip' | translate}}</kc-tooltip>
-            </div>
-           
-            <div class="form-group clearfix">
-                <label class="col-md-2 control-label" for="defaultScope">{{:: 'default-scopes' | translate}} </label>
-                <div class="col-md-6">
-                    <input class="form-control" id="defaultScope" type="text" ng-model="identityProvider.config.defaultScope">
-                    <a href="https://partenaires.franceconnect.gouv.fr/fcp/fournisseur-service#identite_pivot" target="_blank" rel="noopener noreferrer">{{:: 'franceconnect.scopes.supported' | translate}}</a>
-                </div>
-                <kc-tooltip>{{:: 'identity-provider.default-scopes.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="acrValues">{{:: 'franceconnect.acr_values' | translate}}</label>
-                <div class="col-md-6">
-                    <div>
-                        <select class="form-control" id="acrValues" ng-model="identityProvider.config.acr_values">
-                            <option value="eidas1">{{:: 'franceconnect.acr_values.eidas1' | translate}}</option>
-                            <option value="eidas2">{{:: 'franceconnect.acr_values.eidas2' | translate}}</option>
-                            <option value="eidas3">{{:: 'franceconnect.acr_values.eidas3' | translate}}</option>
-                        </select>
-                    </div>
-                </div>
-                <kc-tooltip>{{:: 'franceconnect.acr_values.tooltip' | translate}}</kc-tooltip>
-            </div>
+
             <div class="form-group">
                 <label class="col-md-2 control-label" for="prompt">{{:: 'prompt' | translate}}</label>
                 <div class="col-md-6">
@@ -185,14 +190,12 @@
                 <kc-tooltip>{{:: 'identity-provider.validate-signatures.tooltip' | translate}}</kc-tooltip>
             </div>
             <div class="form-group">
-                <label class="col-md-2 control-label" for="ignoreAbsentStateParameterLogout">Ignore Absent State Parameter on logout</label>
+                <label class="col-md-2 control-label" for="ignoreAbsentStateParameterLogout">{{:: 'franceconnect.logout.ignorstateparam' | translate}}</label>
                 <div class="col-md-6">
                     <input ng-model="identityProvider.config.ignoreAbsentStateParameterLogout" id="ignoreAbsentStateParameterLogout" onoffswitchvalue on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
                 </div>
-                <kc-tooltip>Enable to avoid errors when FranceConnect doesn''t return the sate parameter on logout</kc-tooltip>
+                <kc-tooltip>{{:: 'franceconnect.logout.ignorstateparam.tooltip' | translate}}</kc-tooltip>
             </div>
-
-
             <div class="form-group">
                 <label class="col-md-2 control-label" for="allowedClockSkew">{{:: 'allowed-clock-skew' | translate}}</label>
                 <div class="col-md-6">
@@ -254,4 +257,4 @@
 </div>
 
 
-<kc-menu></kc-menu>
\ No newline at end of file
+<kc-menu></kc-menu>
diff --git a/src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier.html b/src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier.html
index de3ac1d..04133cf 100644
--- a/src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier.html
+++ b/src/main/resources/theme-resources/resources/partials/realm-identity-provider-franceconnect-particulier.html
@@ -1,258 +1,260 @@
 <div class="col-sm-9 col-md-10 col-sm-push-3 col-md-push-2">
-    <ol class="breadcrumb">
-        <li><a href="#/realms/{{realm.realm}}/identity-provider-settings">{{:: 'identity-providers' | translate}}</a></li>
-        <li data-ng-show="!newIdentityProvider && identityProvider.displayName">{{identityProvider.displayName}}</li>
-        <li data-ng-show="!newIdentityProvider && !identityProvider.displayName">{{identityProvider.alias}}</li>
-        <li data-ng-show="newIdentityProvider">{{:: 'add-identity-provider' | translate}}</li>
-    </ol>
-
-    <kc-tabs-identity-provider></kc-tabs-identity-provider>
-
-    <form class="form-horizontal" name="realmForm" novalidate kc-read-only="!access.manageIdentityProviders">
-        <fieldset>
-            <div class="form-group clearfix">
-                <label class="col-md-2 control-label" for="redirectUri">{{:: 'redirect-uri' | translate}}</label>
-                <div class="col-md-6">
-                    <input class="form-control" id="redirectUri" type="text" value="{{callbackUrl}}{{identityProvider.alias}}/endpoint" readonly kc-select-action="click">
-                </div>
-                <kc-tooltip>{{:: 'redirect-uri.tooltip' | translate}}</kc-tooltip>
-            </div>
-        </fieldset>
-        <fieldset>
-            <div class="form-group clearfix">
-                <label class="col-md-2 control-label" for="identifier"><span class="required">*</span> {{:: 'alias' | translate}}</label>
-                <div class="col-md-6">
-                    <input class="form-control" id="identifier" type="text" ng-model="identityProvider.alias" data-ng-readonly="!newIdentityProvider" required>
-                </div>
-                <kc-tooltip>{{:: 'identity-provider.alias.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group clearfix">
-                <label class="col-md-2 control-label" for="displayName"> {{:: 'display-name' | translate}}</label>
-                <div class="col-md-6">
-                    <input class="form-control" id="displayName" type="text" ng-model="identityProvider.displayName">
-                </div>
-                <kc-tooltip>{{:: 'identity-provider.display-name.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="enabled">{{:: 'enabled' | translate}}</label>
-                <div class="col-md-6">
-                    <input ng-model="identityProvider.enabled" id="enabled" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+        <ol class="breadcrumb">
+            <li><a href="#/realms/{{realm.realm}}/identity-provider-settings">{{:: 'identity-providers' | translate}}</a></li>
+            <li data-ng-show="!newIdentityProvider && identityProvider.displayName">{{identityProvider.displayName}}</li>
+            <li data-ng-show="!newIdentityProvider && !identityProvider.displayName">{{identityProvider.alias}}</li>
+            <li data-ng-show="newIdentityProvider">{{:: 'add-identity-provider' | translate}}</li>
+        </ol>
+    
+        <kc-tabs-identity-provider></kc-tabs-identity-provider>
+    
+        <form class="form-horizontal" name="realmForm" novalidate kc-read-only="!access.manageIdentityProviders">
+            <fieldset>
+                <div class="form-group clearfix">
+                    <label class="col-md-2 control-label" for="redirectUri">{{:: 'redirect-uri' | translate}}</label>
+                    <div class="col-md-6">
+                        <input class="form-control" id="redirectUri" type="text" value="{{callbackUrl}}{{identityProvider.alias}}/endpoint" readonly kc-select-action="click">
+                    </div>
+                    <kc-tooltip>{{:: 'redirect-uri.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'identity-provider.enabled.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="storeToken">{{:: 'store-tokens' | translate}}</label>
-                <div class="col-md-6">
-                    <input ng-model="identityProvider.storeToken" id="storeToken" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                <div class="form-group clearfix">
+                    <label class="col-md-2 control-label" for="identifier"><span class="required">*</span> {{:: 'alias' | translate}}</label>
+                    <div class="col-md-6">
+                        <input class="form-control" id="identifier" type="text" ng-model="identityProvider.alias" data-ng-readonly="!newIdentityProvider" required>
+                    </div>
+                    <kc-tooltip>{{:: 'identity-provider.alias.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'identity-provider.store-tokens.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="storedTokensReadable">{{:: 'stored-tokens-readable' | translate}}</label>
-                <div class="col-md-6">
-                    <input ng-model="identityProvider.addReadTokenRoleOnCreate" id="storedTokensReadable" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                <div class="form-group clearfix">
+                    <label class="col-md-2 control-label" for="displayName"> {{:: 'display-name' | translate}}</label>
+                    <div class="col-md-6">
+                        <input class="form-control" id="displayName" type="text" ng-model="identityProvider.displayName">
+                    </div>
+                    <kc-tooltip>{{:: 'identity-provider.display-name.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'identity-provider.stored-tokens-readable.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="trustEmail">{{:: 'trust-email' | translate}}</label>
-                <div class="col-md-6">
-                    <input ng-model="identityProvider.trustEmail" name="identityProvider.trustEmail" id="trustEmail" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                <div class="form-group clearfix">
+                    <label class="col-md-2 control-label" for="clientId"><span class="required">*</span> {{:: 'client-id' | translate}}</label>
+                    <div class="col-md-6">
+                        <input class="form-control" id="clientId" type="text" ng-model="identityProvider.config.clientId" required>
+                    </div>
+                    <div class="col-sm-4">
+                        <a target="_blank" rel="noopener noreferrer" href="https://partenaires.franceconnect.gouv.fr/monprojet/cadrage/">{{:: 'franceconnect.account.managment.link' | translate}}</a>
+                    </div>
+                    <kc-tooltip>{{:: 'identity-provider.client-id.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'trust-email.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="linkOnly">{{:: 'link-only' | translate}}</label>
-                <div class="col-md-6">
-                    <input ng-model="identityProvider.linkOnly" name="identityProvider.trustEmail" id="linkOnly" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                <div class="form-group clearfix">
+                    <label class="col-md-2 control-label" for="clientSecret"><span class="required">*</span> {{:: 'client-secret' | translate}}</label>
+                    <div class="col-md-6">
+                        <input class="form-control" id="clientSecret" kc-password ng-model="identityProvider.config.clientSecret" required>
+                    </div>
+                    <kc-tooltip>{{:: 'client-secret.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'link-only.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="hideOnLoginPage">{{:: 'hide-on-login-page' | translate}}</label>
-                <div class="col-md-6">
-                    <input ng-model="identityProvider.config.hideOnLoginPage" name="identityProvider.config.hideOnLoginPage" id="hideOnLoginPage" onoffswitchvalue on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                <div class="form-group clearfix">
+                        <label class="col-md-2 control-label" for="defaultScope">{{:: 'default-scopes' | translate}} </label>
+                        <div class="col-md-6">
+                            <input class="form-control" id="defaultScope" type="text" ng-model="identityProvider.config.defaultScope">
+                        </div>
+                        <div class="col-sm-4">
+                            <a target="_blank" rel="noopener noreferrer" href="https://partenaires.franceconnect.gouv.fr/fcp/fournisseur-service#identite_pivot">{{:: 'franceconnect.scopes.supported' | translate}}</a>
+                        </div>
+                        <kc-tooltip>{{:: 'identity-provider.default-scopes.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'hide-on-login-page.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="guiOrder">{{:: 'gui-order' | translate}}</label>
-                <div class="col-md-6">
-                    <input class="form-control" id="guiOrder" type="text" ng-model="identityProvider.config.guiOrder">
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="acrValues">{{:: 'franceconnect.acr_values' | translate}}</label>
+                    <div class="col-md-6">
+                        <div>
+                            <select class="form-control" id="acrValues" ng-model="identityProvider.config.acr_values">
+                                <option value="eidas1">{{:: 'franceconnect.acr_values.eidas1' | translate}}</option>
+                                <option value="eidas2">{{:: 'franceconnect.acr_values.eidas2' | translate}}</option>
+                                <option value="eidas3">{{:: 'franceconnect.acr_values.eidas3' | translate}}</option>
+                            </select>
+                        </div>
+                    </div>
+                    <kc-tooltip>{{:: 'franceconnect.acr_values.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'gui-order.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="firstBrokerLoginFlowAlias">{{:: 'first-broker-login-flow' | translate}}</label>
-                <div class="col-md-6">
-                    <div>
-                        <select class="form-control" id="firstBrokerLoginFlowAlias"
-                                ng-model="identityProvider.firstBrokerLoginFlowAlias"
-                                ng-options="flow.alias as flow.alias for flow in authFlows"
-                                required>
-                        </select>
+                <div class="form-group">
+                        <label class="col-md-2 control-label" for="enabled">{{:: 'enabled' | translate}}</label>
+                        <div class="col-md-6">
+                            <input ng-model="identityProvider.enabled" id="enabled" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                        </div>
+                        <kc-tooltip>{{:: 'identity-provider.enabled.tooltip' | translate}}</kc-tooltip>
+                    </div>    
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="trustEmail">{{:: 'trust-email' | translate}}</label>
+                    <div class="col-md-6">
+                        <input ng-model="identityProvider.trustEmail" name="identityProvider.trustEmail" id="trustEmail" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
                     </div>
+                    <kc-tooltip>{{:: 'trust-email.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'first-broker-login-flow.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="postBrokerLoginFlowAlias">{{:: 'post-broker-login-flow' | translate}}</label>
-                <div class="col-md-6">
-                    <div>
-                        <select class="form-control" id="postBrokerLoginFlowAlias"
-                                ng-model="identityProvider.postBrokerLoginFlowAlias"
-                                ng-options="flow.alias as flow.alias for flow in postBrokerAuthFlows">
-                        </select>
+                
+            </fieldset>
+    
+            <fieldset>
+                <legend collapsed><span class="text">{{:: 'franceconnect.config.advanced' | translate}}</span> <kc-tooltip>{{:: 'franceconnect.config.advanced.tooltip' | translate}}</kc-tooltip></legend>
+    
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="storeToken">{{:: 'store-tokens' | translate}}</label>
+                    <div class="col-md-6">
+                        <input ng-model="identityProvider.storeToken" id="storeToken" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
                     </div>
+                    <kc-tooltip>{{:: 'identity-provider.store-tokens.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'post-broker-login-flow.tooltip' | translate}}</kc-tooltip>
-            </div>
-        </fieldset>
-        <fieldset>
-            <legend uncollapsed><span class="text">{{:: 'openid-connect-config' | translate}}</span> <kc-tooltip>{{:: 'openid-connect-config.tooltip' | translate}}</kc-tooltip></legend>
-           
-            <div class="form-group">
-                <label class="col-sm-2 control-label" for="loginHint">{{:: 'loginHint' | translate}}</label>
-                <div class="col-sm-4">
-                    <input ng-model="identityProvider.config.loginHint" id="loginHint" onoffswitchvalue on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="storedTokensReadable">{{:: 'stored-tokens-readable' | translate}}</label>
+                    <div class="col-md-6">
+                        <input ng-model="identityProvider.addReadTokenRoleOnCreate" id="storedTokensReadable" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                    </div>
+                    <kc-tooltip>{{:: 'identity-provider.stored-tokens-readable.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'loginHint.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-label" for="uiLocales">{{:: 'uiLocales' | translate}}</label>
-                <div class="col-sm-4">
-                    <input ng-model="identityProvider.config.uiLocales" id="uiLocales" onoffswitchvalue on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="linkOnly">{{:: 'link-only' | translate}}</label>
+                    <div class="col-md-6">
+                        <input ng-model="identityProvider.linkOnly" name="identityProvider.trustEmail" id="linkOnly" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                    </div>
+                    <kc-tooltip>{{:: 'link-only.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'uiLocales.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group clearfix">
-                <label class="col-md-2 control-label" for="clientId"><span class="required">*</span> {{:: 'client-id' | translate}}</label>
-                <div class="col-md-6">
-                    <input class="form-control" id="clientId" type="text" ng-model="identityProvider.config.clientId" required>
-                    <a href="https://partenaires.franceconnect.gouv.fr/monprojet/cadrage/" target="_blank" rel="noopener noreferrer">{{:: 'franceconnect.account.managment.link' | translate}}--></a>
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="hideOnLoginPage">{{:: 'hide-on-login-page' | translate}}</label>
+                    <div class="col-md-6">
+                        <input ng-model="identityProvider.config.hideOnLoginPage" name="identityProvider.config.hideOnLoginPage" id="hideOnLoginPage" onoffswitchvalue on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                    </div>
+                    <kc-tooltip>{{:: 'hide-on-login-page.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'identity-provider.client-id.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group clearfix">
-                <label class="col-md-2 control-label" for="clientSecret"><span class="required">*</span> {{:: 'client-secret' | translate}}</label>
-                <div class="col-md-6">
-                    <input class="form-control" id="clientSecret" kc-password ng-model="identityProvider.config.clientSecret" required>
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="guiOrder">{{:: 'gui-order' | translate}}</label>
+                    <div class="col-md-6">
+                        <input class="form-control" id="guiOrder" type="text" ng-model="identityProvider.config.guiOrder">
+                    </div>
+                    <kc-tooltip>{{:: 'gui-order.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'client-secret.tooltip' | translate}}</kc-tooltip>
-            </div>
-           
-            <div class="form-group clearfix">
-                <label class="col-md-2 control-label" for="defaultScope">{{:: 'default-scopes' | translate}} </label>
-                <div class="col-md-6">
-                    <input class="form-control" id="defaultScope" type="text" ng-model="identityProvider.config.defaultScope">
-                    <a href="https://partenaires.franceconnect.gouv.fr/fcp/fournisseur-service#identite_pivot" target="_blank" rel="noopener noreferrer">{{:: 'franceconnect.scopes.supported' | translate}}</a>
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="firstBrokerLoginFlowAlias">{{:: 'first-broker-login-flow' | translate}}</label>
+                    <div class="col-md-6">
+                        <div>
+                            <select class="form-control" id="firstBrokerLoginFlowAlias"
+                                    ng-model="identityProvider.firstBrokerLoginFlowAlias"
+                                    ng-options="flow.alias as flow.alias for flow in authFlows"
+                                    required>
+                            </select>
+                        </div>
+                    </div>
+                    <kc-tooltip>{{:: 'first-broker-login-flow.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'identity-provider.default-scopes.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="acrValues">{{:: 'franceconnect.acr_values' | translate}}</label>
-                <div class="col-md-6">
-                    <div>
-                        <select class="form-control" id="acrValues" ng-model="identityProvider.config.acr_values">
-                            <option value="eidas1">{{:: 'franceconnect.acr_values.eidas1' | translate}}</option>
-                            <option value="eidas2">{{:: 'franceconnect.acr_values.eidas2' | translate}}</option>
-                            <option value="eidas3">{{:: 'franceconnect.acr_values.eidas3' | translate}}</option>
-                        </select>
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="postBrokerLoginFlowAlias">{{:: 'post-broker-login-flow' | translate}}</label>
+                    <div class="col-md-6">
+                        <div>
+                            <select class="form-control" id="postBrokerLoginFlowAlias"
+                                    ng-model="identityProvider.postBrokerLoginFlowAlias"
+                                    ng-options="flow.alias as flow.alias for flow in postBrokerAuthFlows">
+                            </select>
+                        </div>
                     </div>
+                    <kc-tooltip>{{:: 'post-broker-login-flow.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'franceconnect.acr_values.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="prompt">{{:: 'prompt' | translate}}</label>
-                <div class="col-md-6">
-                    <div>
-                        <select class="form-control" id="prompt" ng-model="identityProvider.config.prompt">
-                            <option value="">{{:: 'unspecified.option' | translate}}</option>
-                            <option value="none">{{:: 'none.option' | translate}}</option>
-                            <option value="consent">{{:: 'consent.option' | translate}}</option>
-                            <option value="login">{{:: 'login.option' | translate}}</option>
-                            <option value="select_account">{{:: 'select-account.option' | translate}}</option>
-                        </select>
+               
+                <div class="form-group">
+                    <label class="col-sm-2 control-label" for="loginHint">{{:: 'loginHint' | translate}}</label>
+                    <div class="col-sm-4">
+                        <input ng-model="identityProvider.config.loginHint" id="loginHint" onoffswitchvalue on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
                     </div>
+                    <kc-tooltip>{{:: 'loginHint.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'prompt.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="validateSignature">{{:: 'validate-signatures' | translate}}</label>
-                <div class="col-md-6">
-                    <input ng-model="identityProvider.config.validateSignature" id="validateSignature" onoffswitchvalue on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                <div class="form-group">
+                    <label class="col-sm-2 control-label" for="uiLocales">{{:: 'uiLocales' | translate}}</label>
+                    <div class="col-sm-4">
+                        <input ng-model="identityProvider.config.uiLocales" id="uiLocales" onoffswitchvalue on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                    </div>
+                    <kc-tooltip>{{:: 'uiLocales.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'identity-provider.validate-signatures.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="ignoreAbsentStateParameterLogout">Ignore Absent State Parameter on logout</label>
-                <div class="col-md-6">
-                    <input ng-model="identityProvider.config.ignoreAbsentStateParameterLogout" id="ignoreAbsentStateParameterLogout" onoffswitchvalue on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+    
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="prompt">{{:: 'prompt' | translate}}</label>
+                    <div class="col-md-6">
+                        <div>
+                            <select class="form-control" id="prompt" ng-model="identityProvider.config.prompt">
+                                <option value="">{{:: 'unspecified.option' | translate}}</option>
+                                <option value="none">{{:: 'none.option' | translate}}</option>
+                                <option value="consent">{{:: 'consent.option' | translate}}</option>
+                                <option value="login">{{:: 'login.option' | translate}}</option>
+                                <option value="select_account">{{:: 'select-account.option' | translate}}</option>
+                            </select>
+                        </div>
+                    </div>
+                    <kc-tooltip>{{:: 'prompt.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>Enable to avoid errors when FranceConnect doesn''t return the sate parameter on logout</kc-tooltip>
-            </div>
-
-
-
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="allowedClockSkew">{{:: 'allowed-clock-skew' | translate}}</label>
-                <div class="col-md-6">
-                    <input ng-model="identityProvider.config.allowedClockSkew" id="allowedClockSkew" type="text" class="form-control"/>
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="validateSignature">{{:: 'validate-signatures' | translate}}</label>
+                    <div class="col-md-6">
+                        <input ng-model="identityProvider.config.validateSignature" id="validateSignature" onoffswitchvalue on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                    </div>
+                    <kc-tooltip>{{:: 'identity-provider.validate-signatures.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'identity-provider.allowed-clock-skew.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="forwardParameters">{{:: 'forwarded-query-parameters' | translate}}</label>
-                <div class="col-md-6">
-                    <input class="form-control" id="forwardParameters" type="text" ng-model="identityProvider.config.forwardParameters"/>
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="ignoreAbsentStateParameterLogout">{{:: 'franceconnect.logout.ignorstateparam' | translate}}</label>
+                    <div class="col-md-6">
+                        <input ng-model="identityProvider.config.ignoreAbsentStateParameterLogout" id="ignoreAbsentStateParameterLogout" onoffswitchvalue on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
+                    </div>
+                    <kc-tooltip>{{:: 'franceconnect.logout.ignorstateparam.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'identity-provider.forwarded-query-parameters.tooltip' | translate}}</kc-tooltip>
-            </div>
-        </fieldset>
-        <fieldset data-ng-show="newIdentityProvider">
-            <legend uncollapsed><span class="text">{{:: 'import-external-idp-config' | translate}}</span> <kc-tooltip>{{:: 'import-external-idp-config.tooltip' | translate}}</kc-tooltip></legend>
-            <div class="form-group" data-ng-show="newIdentityProvider">
-                <label class="col-md-2 control-label" for="fromUrl">{{:: 'import-from-url' | translate}}</label>
-                <div class="col-md-6">
-                    <input class="form-control" id="fromUrl" type="text" ng-model="fromUrl.data">
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="allowedClockSkew">{{:: 'allowed-clock-skew' | translate}}</label>
+                    <div class="col-md-6">
+                        <input ng-model="identityProvider.config.allowedClockSkew" id="allowedClockSkew" type="text" class="form-control"/>
+                    </div>
+                    <kc-tooltip>{{:: 'identity-provider.allowed-clock-skew.tooltip' | translate}}</kc-tooltip>
                 </div>
-                <kc-tooltip>{{:: 'identity-provider.import-from-url.tooltip' | translate}}</kc-tooltip>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="importFrom"></label>
-                <div class="col-md-6">
-                    <button id="importFrom" type="button" data-ng-click="importFrom()" data-ng-show="importUrl" class="btn btn-primary">{{:: 'import' | translate}}</button>
+                <div class="form-group">
+                    <label class="col-md-2 control-label" for="forwardParameters">{{:: 'forwarded-query-parameters' | translate}}</label>
+                    <div class="col-md-6">
+                        <input class="form-control" id="forwardParameters" type="text" ng-model="identityProvider.config.forwardParameters"/>
+                    </div>
+                    <kc-tooltip>{{:: 'identity-provider.forwarded-query-parameters.tooltip' | translate}}</kc-tooltip>
                 </div>
-            </div>
-            <div class="form-group" data-ng-show="newIdentityProvider">
-                <label class="col-md-2 control-label">{{:: 'import-from-file' | translate}}</label>
-                <kc-tooltip>{{:: 'identity-provider.import-from-file.tooltip' | translate}}</kc-tooltip>
-                <div class="col-md-6">
-                    <div class="controls kc-button-input-file" data-ng-show="!files || files.length == 0">
-                        <label for="import-file" class="btn btn-default">{{:: 'select-file' | translate}} <i class="pficon pficon-import"></i></label>
-                        <input id="import-file" type="file" class="hidden" ng-file-select="onFileSelect($files)">
+            </fieldset>
+            <fieldset data-ng-show="newIdentityProvider">
+                <legend uncollapsed><span class="text">{{:: 'import-external-idp-config' | translate}}</span> <kc-tooltip>{{:: 'import-external-idp-config.tooltip' | translate}}</kc-tooltip></legend>
+                <div class="form-group" data-ng-show="newIdentityProvider">
+                    <label class="col-md-2 control-label" for="fromUrl">{{:: 'import-from-url' | translate}}</label>
+                    <div class="col-md-6">
+                        <input class="form-control" id="fromUrl" type="text" ng-model="fromUrl.data">
                     </div>
-                <span class="kc-uploaded-file" data-ng-show="files.length > 0">
-                    {{files[0].name}}
-                </span>
+                    <kc-tooltip>{{:: 'identity-provider.import-from-url.tooltip' | translate}}</kc-tooltip>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label" for="importFile"></label>
-                    <div class="col-md-6" data-ng-show="importFile">
-                        <button id="importFile" type="button" data-ng-click="uploadFile()" data-ng-show="importFile" class="btn btn-primary">{{:: 'import' | translate}}</button>
+                    <label class="col-md-2 control-label" for="importFrom"></label>
+                    <div class="col-md-6">
+                        <button id="importFrom" type="button" data-ng-click="importFrom()" data-ng-show="importUrl" class="btn btn-primary">{{:: 'import' | translate}}</button>
                     </div>
                 </div>
+                <div class="form-group" data-ng-show="newIdentityProvider">
+                    <label class="col-md-2 control-label">{{:: 'import-from-file' | translate}}</label>
+                    <kc-tooltip>{{:: 'identity-provider.import-from-file.tooltip' | translate}}</kc-tooltip>
+                    <div class="col-md-6">
+                        <div class="controls kc-button-input-file" data-ng-show="!files || files.length == 0">
+                            <label for="import-file" class="btn btn-default">{{:: 'select-file' | translate}} <i class="pficon pficon-import"></i></label>
+                            <input id="import-file" type="file" class="hidden" ng-file-select="onFileSelect($files)">
+                        </div>
+                    <span class="kc-uploaded-file" data-ng-show="files.length > 0">
+                        {{files[0].name}}
+                    </span>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label" for="importFile"></label>
+                        <div class="col-md-6" data-ng-show="importFile">
+                            <button id="importFile" type="button" data-ng-click="uploadFile()" data-ng-show="importFile" class="btn btn-primary">{{:: 'import' | translate}}</button>
+                        </div>
+                    </div>
+                </div>
+            </fieldset>
+    
+            <div class="form-group">
+                <div class="col-md-10 col-md-offset-2">
+                    <button kc-save data-ng-disabled="!changed">{{:: 'save' | translate}}</button>
+                    <button kc-cancel data-ng-click="cancel()" data-ng-disabled="!changed">{{:: 'cancel' | translate}}</button>
+                </div>
             </div>
-        </fieldset>
-
-        <div class="form-group">
-            <div class="col-md-10 col-md-offset-2">
-                <button kc-save data-ng-disabled="!changed">{{:: 'save' | translate}}</button>
-                <button kc-cancel data-ng-click="cancel()" data-ng-disabled="!changed">{{:: 'cancel' | translate}}</button>
-            </div>
-        </div>
-    </form>
-</div>
-
-
-<kc-menu></kc-menu>
\ No newline at end of file
+        </form>
+    </div>
+    
+    
+    <kc-menu></kc-menu>