diff --git a/.htaccess b/.htaccess
index c59e2c4287f2112150acb12814705eae00ed4148..f4148de5d9ba719df38e81570745c0ba8730877e 100644
--- a/.htaccess
+++ b/.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
+
diff --git a/views/account-management.php b/views/account-management.php
index 39712aba8c5797b11af5818f15d1232a6d90a8d6..ab8db20613d18b22f32e65ed57f20d158c57f335 100644
--- a/views/account-management.php
+++ b/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>