Merge branch 'development'

.htaccess

@@ -12,3 +12,5 @@ SetEnvIf REDIRECT_mail (.+) mail=$1
 SetEnvIf REDIRECT_givenName (.+) givenName=$1
 SetEnvIf REDIRECT_sn (.+) sn=$1
 
+Header edit Set-Cookie ^(.*)$ $1;HttpOnly;Secure;SameSite=Lax
+

views/account-management.php

@@ -20,7 +20,7 @@ include 'include/header.php';
     <div class="col-sm-2">
         <div class="row">
             <div class="col-sm-12">
-                <a class="btn btn-success" id="join-btn" href="<?php echo $contextRoot; ?>?action=join" title="Perform an additional login to join your identities" data-toggle="tooltip" data-placement="bottom">
+                <a class="btn btn-success disabled" id="join-btn" href="<?php echo $contextRoot; ?>?action=join" title="Perform an additional login to join your identities" data-toggle="tooltip" data-placement="bottom">
                     Join with another identity
                 </a>
             </div>