diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index b28da702f2..693613fb7b 100755
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -95,9 +95,7 @@ class ProfileController extends Controller
             abort(403);
         }
 
-        return view('account/api', [
-            'tokens' => Auth::user()->tokens()->get(),
-        ]);
+        return view('account/api');
     }
 
     /**
diff --git a/app/Http/Livewire/PersonalAccessTokens.php b/app/Http/Livewire/PersonalAccessTokens.php
index c9e30a9430..52ee05cedc 100644
--- a/app/Http/Livewire/PersonalAccessTokens.php
+++ b/app/Http/Livewire/PersonalAccessTokens.php
@@ -3,6 +3,7 @@
 namespace App\Http\Livewire;
 
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 use Livewire\Component;
 
@@ -30,7 +31,10 @@ class PersonalAccessTokens extends Component
 
     public function deleteToken($tokenId): void
     {
-        Auth::user()->tokens()->where('id', $tokenId)->delete();
+        Log::info('poo');
+        //this needs safety (though the scope of auth::user might kind of do it...)
+        //seems like it does, test more
+        Auth::user()->tokens()->find($tokenId)->delete();
     }
 
     public function getTokensProperty(): array
diff --git a/resources/views/account/api.blade.php b/resources/views/account/api.blade.php
index 8098ea7e35..14367ecd66 100644
--- a/resources/views/account/api.blade.php
+++ b/resources/views/account/api.blade.php
@@ -1,15 +1,11 @@
 @extends('layouts/default')
-
 {{-- Page title --}}
 @section('title')
     {{ trans('account/general.personal_api_keys') }}
     @parent
 @stop
-
 {{-- Page content --}}
 @section('content')
-
-
         <div class="row">
             <div class="col-md-8">
 
diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php
index 6f8fcaeb78..ad84e62f84 100644
--- a/resources/views/livewire/personal-access-tokens.blade.php
+++ b/resources/views/livewire/personal-access-tokens.blade.php
@@ -1,19 +1,8 @@
-@props([
-    'token_url' => url('oauth/personal-access-tokens'),
-    'scopes_url' => url('oauth/scopes'),
-])
-
 <div>
-    <p>New Personal Access Token Component</p>
-    <div>
-        <p>{{ $token_url }}</p>
-        <p>{{ $scopes_url }}</p>
-    </div>
-
+    <p>New Livewire Personal Access Token Component</p>
     <div class="panel panel-default">
         <div class="panel-heading">
             <div class="text-right" style="display: flex; justify-content: space-between; align-items: center;">
-
                 <a class="btn btn-info btn-sm action-link pull-right"
                    onclick="$('#modal-create-token').modal('show');"
                 >
@@ -46,7 +35,6 @@
                     <tbody>
                     <tr>
                         <!-- Client Name -->
-
                         <td style="vertical-align: middle;">
                             {{ $token->name }}
                         </td>
@@ -58,28 +46,23 @@
                         <td style="vertical-align: middle;">
                             {{ $token->expires_at }}
                         </td>
-
-
+<td style="vertical-align: middle;">
+                            {{ $token->id }}
+                        </td>
                         <!-- Delete Button -->
                         <td style="vertical-align: middle;" class="text-right">
-                            <a class="action-link btn btn-danger btn-sm" wire:click="deleteToken({{ $token->id }})">
+                            <a class="action-link btn btn-danger btn-sm" wire:click="deleteToken('{{ $token->id }}')">
                                 <i class="fas fa-trash"></i>
                             </a>
                         </td>
                     </tr>
-                    @endforeach
                     </tbody>
+                @endforeach
             </table>
         </div>
-
-
-
     </div>
-
     <!-- Create Token Modal -->
     <x-personal-access-tokens.create-token-modal />
-
     <!-- View New Token Modal -->
     <x-personal-access-tokens.view-new-token />
-
 </div>
\ No newline at end of file