diff --git a/app/Http/Livewire/OauthClients.php b/app/Http/Livewire/OauthClients.php
index 8e23f6335c..fadcd39fd8 100644
--- a/app/Http/Livewire/OauthClients.php
+++ b/app/Http/Livewire/OauthClients.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Livewire;
 
-use Illuminate\Support\Facades\Auth;
+use Laravel\Passport\Client;
 use Laravel\Passport\ClientRepository;
 use Livewire\Component;
 
@@ -29,11 +29,12 @@ class OauthClients extends Component
 
         //$newClient = ;
 
-        $this->dispatchBrowserEvent('clientCreated', $newClient->accessToken);
+        //$this->dispatchBrowserEvent('clientCreated', $newClient->accessToken);
     }
 
-    public function deleteClient($clientId): void
+    public function deleteClient(Client $clientId): void
     {
-        Auth::user()->clients()->find($clientId)->delete();
+        //->delete must be of type Client - thus the model binding
+        app(ClientRepository::class)->delete($clientId);
     }
 }
diff --git a/resources/views/livewire/oauth-clients.blade.php b/resources/views/livewire/oauth-clients.blade.php
index 8f6c45cb8d..4c7be6c79c 100644
--- a/resources/views/livewire/oauth-clients.blade.php
+++ b/resources/views/livewire/oauth-clients.blade.php
@@ -1,43 +1,30 @@
-<style scoped>
-    .action-link {
-        cursor: pointer;
-    }
+<div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <div style="display: flex; justify-content: space-between; align-items: center;">
+                <h2>
+                    (Livewire) OAuth Clients
+                </h2>
 
-    .m-b-none {
-        margin-bottom: 0;
-    }
-</style>
-
-<template>
-    <div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <div style="display: flex; justify-content: space-between; align-items: center;">
-                    <h2>
-                        (Livewire) OAuth Clients
-                    </h2>
-
-                    <a class="action-link"
+                <a class="action-link"
 {{--                       @click="showCreateClientForm"--}}
-                    >
-                        Create New Client
-                    </a>
-                </div>
+                >
+                    Create New Client
+                </a>
             </div>
+        </div>
 
-            <div class="panel-body">
-                <!-- Current Clients -->
-                @if($clients->count() === 0)
-                    <p class="m-b-none">
-                        You have not created any OAuth clients.
-                    </p>
-                @endif
+        <div class="panel-body">
+            <!-- Current Clients -->
+            @if($clients->count() === 0)
+                <p class="m-b-none">
+                    You have not created any OAuth clients.
+                </p>
+            @endif
 
-                @if($clients->count() > 0)
-                    <table class="table table-borderless m-b-none"
-    {{--                       v-if="clients.length > 0"--}}
-                    >
-                        <thead>
+            @if($clients->count() > 0)
+                <table class="table table-borderless m-b-none">
+                    <thead>
                         <tr>
                             <th>Client ID</th>
                             <th>Name</th>
@@ -45,12 +32,11 @@
                             <th><span class="sr-only">Edit</span></th>
                             <th><span class="sr-only">Delete</span></th>
                         </tr>
-                        </thead>
+                    </thead>
 
-                        <tbody>
+                    <tbody>
                         @foreach($clients as $client)
-                            <tr
-                            >
+                            <tr>
                                 <!-- ID -->
                                 <td style="vertical-align: middle;">
                                     {{ $client->id }}
@@ -76,175 +62,175 @@
                                 </td>
 
                                 <!-- Delete Button -->
-                                <td style="vertical-align: middle;">
-                                    <a class="action-link btn btn-danger btn-sm"
-                                       wire:click="deleteClient('{{ $client->id }}')"
-                                    >
-                                        Delete
+                                <td style="vertical-align: middle;" class="text-right">
+                                    <a class="action-link btn btn-danger btn-sm" wire:click="deleteClient('{{ $client->id }}')">
+                                        <i class="fas fa-trash"></i>
                                     </a>
                                 </td>
                             </tr>
                         @endforeach
-                        </tbody>
-                    </table>
-                @endif
-            </div>
+                    </tbody>
+                </table>
+            @endif
         </div>
+    </div>
 
-        <!-- Create Client Modal -->
-        <div class="modal fade" id="modal-create-client" tabindex="-1" role="dialog">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <!-- Create Client Modal -->
+    <div class="modal fade" id="modal-create-client" tabindex="-1" role="dialog">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 
-                        <h2 class="modal-title">
-                            Create Client
-                        </h2>
+                    <h2 class="modal-title">
+                        Create Client
+                    </h2>
+                </div>
+
+                <div class="modal-body">
+                    <!-- Form Errors -->
+                    <div class="alert alert-danger"
+{{--                             v-if="createForm.errors.length > 0"--}}
+                    >
+                        <p><strong>Whoops!</strong> Something went wrong!</p>
+                        <br>
+                        <ul>
+                            <li
+{{--                                        v-for="error in createForm.errors"--}}
+                            >
+{{--                                    {{ error }}--}}
+                            </li>
+                        </ul>
                     </div>
 
-                    <div class="modal-body">
-                        <!-- Form Errors -->
-                        <div class="alert alert-danger"
-{{--                             v-if="createForm.errors.length > 0"--}}
-                        >
-                            <p><strong>Whoops!</strong> Something went wrong!</p>
-                            <br>
-                            <ul>
-                                <li
-{{--                                        v-for="error in createForm.errors"--}}
-                                >
-{{--                                    {{ error }}--}}
-                                </li>
-                            </ul>
-                        </div>
+                    <!-- Create Client Form -->
+                    <form class="form-horizontal" role="form">
+                        <!-- Name -->
+                        <div class="form-group">
+                            <label class="col-md-3 control-label" for="create-client-name">Name</label>
 
-                        <!-- Create Client Form -->
-                        <form class="form-horizontal" role="form">
-                            <!-- Name -->
-                            <div class="form-group">
-                                <label class="col-md-3 control-label" for="create-client-name">Name</label>
-
-                                <div class="col-md-7">
-                                    <input id="create-client-name" type="text" aria-label="create-client-name" class="form-control"
+                            <div class="col-md-7">
+                                <input id="create-client-name" type="text" aria-label="create-client-name" class="form-control"
 {{--                                           @keyup.enter="store" --}}
 {{--                                           v-model="createForm.name"--}}
-                                    >
-
-                                    <span class="help-block">
-                                        Something your users will recognize and trust.
-                                    </span>
-                                </div>
-                            </div>
-
-                            <!-- Redirect URL -->
-                            <div class="form-group">
-                                <label class="col-md-3 control-label" for="redirect">Redirect URL</label>
-
-                                <div class="col-md-7">
-                                    <input type="text" class="form-control" aria-label="redirect" name="redirect"
-{{--                                           @keyup.enter="store" --}}
-{{--                                           v-model="createForm.redirect"--}}
-                                    >
-
-                                    <span class="help-block">
-                                        Your application's authorization callback URL.
-                                    </span>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-
-                    <!-- Modal Actions -->
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-
-                        <button type="button" class="btn btn-primary"
-{{--                                @click="store"--}}
-                        >
-                            Create
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!-- Edit Client Modal -->
-        <div class="modal fade" id="modal-edit-client" tabindex="-1" role="dialog">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button " class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-
-                        <h4 class="modal-title">
-                            Edit Client
-                        </h4>
-                    </div>
-
-                    <div class="modal-body">
-                        <!-- Form Errors -->
-                        <div class="alert alert-danger"
-{{--                             v-if="editForm.errors.length > 0"--}}
-                        >
-                            <p><strong>Whoops!</strong> Something went wrong!</p>
-                            <br>
-                            <ul>
-                                <li
-{{--                                        v-for="error in editForm.errors"--}}
                                 >
-{{--                                    {{ error }}--}}
-                                </li>
-                            </ul>
+
+                                <span class="help-block">
+                                    Something your users will recognize and trust.
+                                </span>
+                            </div>
                         </div>
 
-                        <!-- Edit Client Form -->
-                        <form class="form-horizontal" role="form">
-                            <!-- Name -->
-                            <div class="form-group">
-                                <label class="col-md-3 control-label" for="edit-client-name">Name</label>
+                        <!-- Redirect URL -->
+                        <div class="form-group">
+                            <label class="col-md-3 control-label" for="redirect">Redirect URL</label>
 
-                                <div class="col-md-7">
-                                    <input id="edit-client-name" type="text" aria-label="edit-client-name" class="form-control"
-{{--                                           @keyup.enter="update" --}}
-{{--                                           v-model="editForm.name"--}}
-                                    >
+                            <div class="col-md-7">
+                                <input type="text" class="form-control" aria-label="redirect" name="redirect"
+{{--                                           @keyup.enter="store" --}}
+{{--                                           v-model="createForm.redirect"--}}
+                                >
 
-                                    <span class="help-block">
-                                        Something your users will recognize and trust.
-                                    </span>
-                                </div>
+                                <span class="help-block">
+                                    Your application's authorization callback URL.
+                                </span>
                             </div>
+                        </div>
+                    </form>
+                </div>
 
-                            <!-- Redirect URL -->
-                            <div class="form-group">
-                                <label class="col-md-3 control-label" for="redirect">Redirect URL</label>
+                <!-- Modal Actions -->
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
 
-                                <div class="col-md-7">
-                                    <input type="text" class="form-control" name="redirect" aria-label="redirect"
-{{--                                           @keyup.enter="update" --}}
-{{--                                           v-model="editForm.redirect"--}}
-                                    >
-
-                                    <span class="help-block">
-                                        Your application's authorization callback URL.
-                                    </span>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-
-                    <!-- Modal Actions -->
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-
-                        <button type="button" class="btn btn-primary"
-{{--                                @click="update"--}}
-                        >
-                            Save Changes
-                        </button>
-                    </div>
+                    <button type="button" class="btn btn-primary"
+{{--                                @click="store"--}}
+                    >
+                        Create
+                    </button>
                 </div>
             </div>
         </div>
     </div>
-</template>
\ No newline at end of file
+
+    <!-- Edit Client Modal -->
+    <div class="modal fade" id="modal-edit-client" tabindex="-1" role="dialog">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+
+                    <h4 class="modal-title">
+                        Edit Client
+                    </h4>
+                </div>
+
+                <div class="modal-body">
+                    <!-- Form Errors -->
+                    <div class="alert alert-danger"
+{{--                             v-if="editForm.errors.length > 0"--}}
+                    >
+                        <p><strong>Whoops!</strong> Something went wrong!</p>
+                        <br>
+                        <ul>
+                            <li
+{{--                                        v-for="error in editForm.errors"--}}
+                            >
+{{--                                    {{ error }}--}}
+                            </li>
+                        </ul>
+                    </div>
+
+                    <!-- Edit Client Form -->
+                    <form class="form-horizontal" role="form">
+                        <!-- Name -->
+                        <div class="form-group">
+                            <label class="col-md-3 control-label" for="edit-client-name">Name</label>
+
+                            <div class="col-md-7">
+                                <input id="edit-client-name" type="text" aria-label="edit-client-name" class="form-control"
+{{--                                           @keyup.enter="update" --}}
+{{--                                           v-model="editForm.name"--}}
+                                >
+
+                                <span class="help-block">
+                                    Something your users will recognize and trust.
+                                </span>
+                            </div>
+                        </div>
+
+                        <!-- Redirect URL -->
+                        <div class="form-group">
+                            <label class="col-md-3 control-label" for="redirect">Redirect URL</label>
+
+                            <div class="col-md-7">
+                                <input type="text" class="form-control" name="redirect" aria-label="redirect"
+{{--                                           @keyup.enter="update" --}}
+{{--                                           v-model="editForm.redirect"--}}
+                                >
+
+                                <span class="help-block">
+                                    Your application's authorization callback URL.
+                                </span>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+
+                <!-- Modal Actions -->
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+
+                    <button type="button" class="btn btn-primary"
+{{--                                @click="update"--}}
+                    >
+                        Save Changes
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+
+    </script>
+</div>
\ No newline at end of file
diff --git a/resources/views/settings/api.blade.php b/resources/views/settings/api.blade.php
index 3c36c6a18f..35ce89dd50 100644
--- a/resources/views/settings/api.blade.php
+++ b/resources/views/settings/api.blade.php
@@ -15,7 +15,7 @@
     @if (!config('app.lock_passwords'))
         <div id="app">
             <livewire:oauth-clients />
-            <passport-clients clients-url="{{ url('oauth/clients') }}"></passport-clients>
+{{--            <passport-clients clients-url="{{ url('oauth/clients') }}"></passport-clients>--}}
             <passport-authorized-clients clients-url="{{ url('oauth/clients') }}" tokens-url="{{ url('oauth/tokens') }}"></passport-authorized-clients>
         </div>
     @else