diff --git a/classes/UserHandler.php b/classes/UserHandler.php
index f65c2946173c21302d77df939f6d114f066a6ffa..d7d2ba8b9a3f4d56d3b4b1581c031bf1482c96b1 100644
--- a/classes/UserHandler.php
+++ b/classes/UserHandler.php
@@ -83,6 +83,8 @@ class UserHandler {
             curl_setopt($conn, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($conn, CURLOPT_SSL_VERIFYPEER, true);
             curl_setopt($conn, CURLOPT_FOLLOWLOCATION, 1);
+            // Setting an empty body, otherwise Content-Length will be negative and Spring will answer with 400
+            curl_setopt($conn, CURLOPT_POSTFIELDS, " "); 
             curl_setopt($conn, CURLOPT_HTTPHEADER, ['Authorization: Bearer '
                 . $this->getJoinAccessToken($userId1, $userId2)]);
 
diff --git a/css/style.css b/css/style.css
index 91f0f6062221109fd82f1427ebd4a6586066047a..124f933a32f1aa91eb6b98aeab54e0d0c6876895 100644
--- a/css/style.css
+++ b/css/style.css
@@ -108,7 +108,7 @@ body {
     font-size: 42px;
 }
 
-.page-title-wrapper a {
+.page-title-wrapper a, .page-title-wrapper a:visited {
     color: #fff;
 }
 
@@ -220,4 +220,4 @@ body {
     position: absolute;
     left: 27px;
     top: 0px;
-}
\ No newline at end of file
+}
diff --git a/version.txt b/version.txt
index 10bf840ed530af123660f5edb1544264d8f2def4..e9307ca5751b252b31c533d41f61df140d3f7537 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.0.1
\ No newline at end of file
+2.0.2
diff --git a/views/account-management.php b/views/account-management.php
index 21e4cdf15147c3ff97b4e44437c5ca4bcc1141cf..cc9cc365ad9bf40d625aa883a1c6c192be689ca2 100644
--- a/views/account-management.php
+++ b/views/account-management.php
@@ -22,14 +22,11 @@ include 'include/header.php';
             <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">
                     Join with another identity
-                </a>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-12">
+                </a><br/>
                 <a class="btn btn-default" id="token-issuer-btn" href="<?php echo $contextRoot; ?>/token-issuer" title="Generate tokens for CLI" data-toggle="tooltip" data-placement="bottom">
                     Token issuer
                 </a>
+                <br/><br/>
             </div>
         </div>
         <?php if ($admin) { ?>