diff --git a/src/Constants.php b/src/Constants.php
index 85dda294..3da8fd76 100644
--- a/src/Constants.php
+++ b/src/Constants.php
@@ -17,11 +17,11 @@ class Constants
     /**
      * The current release version
      */
-    public const VERSION = '2.16.0';
+    public const VERSION = '2.16.1';
     /**
      * The current release: major * 10000 + minor * 100 + patch
      */
-    public const VERSION_ID = 21600;
+    public const VERSION_ID = 21601;
     /**
      * The software name
      */
diff --git a/src/Controller/ProfileController.php b/src/Controller/ProfileController.php
index 3ef76191..0848a4b5 100644
--- a/src/Controller/ProfileController.php
+++ b/src/Controller/ProfileController.php
@@ -173,7 +173,7 @@ final class ProfileController extends AbstractController
             $this->flashSuccess('action.update.success');
             $request->getSession()->set('_show_access_token', $accessToken->getId());
 
-            return $this->redirectToRoute('user_profile_api_token', ['username' => $profile->getUserIdentifier()]);
+            return $this->redirectToRoute('user_profile_api_token', ['username' => $profile->getUserIdentifier(), 'hide-token' => '1']);
         }
 
         return $this->render('user/access-token.html.twig', [
@@ -207,13 +207,15 @@ final class ProfileController extends AbstractController
         $accessTokens = $accessTokenRepository->findForUser($profile);
 
         $createdToken = null;
-        $createdId = $request->getSession()->get('_show_access_token');
-        $request->getSession()->remove('_show_access_token');
 
-        if ($createdId !== null) {
-            foreach ($accessTokens as $accessToken) {
-                if ($accessToken->getId() === $createdId) {
-                    $createdToken = $accessToken;
+        if (!$request->query->has('hide-token')) {
+            $createdId = $request->getSession()->get('_show_access_token');
+            $request->getSession()->remove('_show_access_token');
+            if ($createdId !== null) {
+                foreach ($accessTokens as $accessToken) {
+                    if ($accessToken->getId() === $createdId) {
+                        $createdToken = $accessToken;
+                    }
                 }
             }
         }