diff --git a/app/Http/Controllers/Settings/ApiTokenController.php b/app/Http/Controllers/Settings/ApiTokenController.php
index 296d77e05..f9a1e5ef4 100644
--- a/app/Http/Controllers/Settings/ApiTokenController.php
+++ b/app/Http/Controllers/Settings/ApiTokenController.php
@@ -21,9 +21,9 @@ public function store(CreateApiTokenRequest $request)
     {
         $token = $this->dispatchSync(new CreateApiToken(Auth::user(), $request->name()));
 
-        $this->success('settings.api_token.created', ['token' => $token->plainTextToken]);
+        $this->success('settings.api_token.created');
 
-        return redirect()->route('settings.profile');
+        return redirect()->route('settings.profile')->with('api_token', $token->plainTextToken);
     }
 
     public function destroy(DeleteApiTokenRequest $request)
diff --git a/package-lock.json b/package-lock.json
index af5cf0820..c6d4df7c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,10 +1,9 @@
 {
-  "name": "laravelio",
+  "name": "laravel.io",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "laravelio",
       "devDependencies": {
         "@tailwindcss/aspect-ratio": "^0.2.0",
         "@tailwindcss/forms": "^0.4.0",
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 7f8dab0d8..63aaedad1 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -6,7 +6,7 @@
     'deleted' => 'Account was successfully removed.',
     'password.updated' => 'Password successfully changed!',
     'api_token' => [
-        'created' => 'API token created! Please copy the following token as it will not be shown again: <span class="bg-white text-gray-800 px-1">:token</span>',
+        'created' => 'API token created! Please copy the following token as it will not be shown again:',
         'deleted' => 'API token successfully removed.',
     ],
 ];
diff --git a/resources/views/components/api-token.blade.php b/resources/views/components/api-token.blade.php
new file mode 100644
index 000000000..30d4d750e
--- /dev/null
+++ b/resources/views/components/api-token.blade.php
@@ -0,0 +1,24 @@
+<div>
+    <div x-data="{ showApi: false, copyToast: false }" class="flex justify-end items-center">
+        <input
+            x-bind:type="!showApi ? 'password' : 'text'" name="apikey" readonly="readonly" value="{{ $token }}"
+            class="bg-white mr-2 text-gray-800 px-2 py-1 rounded-md"
+        />
+
+        <x-heroicon-o-clipboard
+            aria-label="Copy API key"
+            @@click="navigator.clipboard.writeText('{{ $token }}'); copyToast = true; setTimeout(() => copyToast = false, 4000)"
+            class="mr-2 text-white h-6 w-6 hover:cursor-pointer"
+        />
+
+        <x-heroicon-o-eye aria-label="Show Api Key" x-show="!showApi" @@click="showApi = true" class="mr-2 h-6 w-6 text-white hover:cursor-pointer" />
+
+        <x-heroicon-o-eye-off aria-label="Hide API Key" x-show="showApi" @@click="showApi = false" class="mr-2 h-6 w-6 text-white hover:cursor-pointer" />
+
+        <div x-show="copyToast" x-transition class="fixed bottom-20 left-0 z-10 right-0 flex justify-center items-center">
+            <span class="text-white z-[99999] bg-gray-800 px-5 py-4 rounded-md text-md">
+                API Key Copied
+            </span>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/layouts/_alerts.blade.php b/resources/views/layouts/_alerts.blade.php
index c70a9250c..4669d237b 100644
--- a/resources/views/layouts/_alerts.blade.php
+++ b/resources/views/layouts/_alerts.blade.php
@@ -17,8 +17,13 @@ class="text-xl"
 
 @if (session()->has('success'))
     <div class="w-full text-white bg-lio-500 p-4" x-data="{}">
-        <div class="flex items-center justify-between container mx-auto px-4">
+        <div class="flex items-center flex-wrap justify-between container mx-auto px-4">
             {!! session()->pull('success') !!}
+
+            @if (session()->has('api_token'))
+                <x-api-token :token="session()->pull('api_token')" />
+            @endif
+
             <button
                 type="button"
                 class="text-xl"
diff --git a/tests/Feature/SettingsTest.php b/tests/Feature/SettingsTest.php
index 6307c2165..ed7880a45 100644
--- a/tests/Feature/SettingsTest.php
+++ b/tests/Feature/SettingsTest.php
@@ -153,7 +153,7 @@
             'name' => 'My API Token',
         ])
         ->seePageIs('/settings')
-        ->see('API token created! Please copy the following token as it will not be shown again: ');
+        ->see('API token created! Please copy the following token as it will not be shown again:');
 
     expect($user->refresh()->tokens)->toHaveCount(1);
 });