diff --git a/app/Http/Livewire/PersonalAccessTokens.php b/app/Http/Livewire/PersonalAccessTokens.php
index 03d2cb7f24..545202580b 100644
--- a/app/Http/Livewire/PersonalAccessTokens.php
+++ b/app/Http/Livewire/PersonalAccessTokens.php
@@ -23,12 +23,13 @@ class PersonalAccessTokens extends Component
     {
         return [
             'name' => 'required|string|max:255',
-            'scopes' => 'nullable|array',
         ];
     }
 
     public function createToken(): void
     {
+       $this->validate();
+
        $newToken = Auth::user()->createToken($this->name);
 
        $this->newTokenString = $newToken->accessToken;
diff --git a/resources/views/components/personal-access-tokens/view-new-token.blade.php b/resources/views/components/personal-access-tokens/view-new-token.blade.php
deleted file mode 100644
index a211747be4..0000000000
--- a/resources/views/components/personal-access-tokens/view-new-token.blade.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="modal fade" id="modal-access-token" 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">
-                    Personal Access Token
-                </h4>
-            </div>
-
-            <div class="modal-body">
-                <p>
-                    Here is your new personal access token. This is the only time it will be shown so don't lose it!
-                    You may now use this token to make API requests.
-                </p>
-
-                <pre><code>
-{{--                    {{ accessToken }}--}}
-                </code></pre>
-            </div>
-
-            <!-- Modal Actions -->
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php
index edc4caaeff..4781d18256 100644
--- a/resources/views/livewire/personal-access-tokens.blade.php
+++ b/resources/views/livewire/personal-access-tokens.blade.php
@@ -72,17 +72,15 @@
 
                 <div class="modal-body">
                     <!-- Form Errors -->
-                    @if($errors === true)
+                    @if($errors->has('name'))
                         <div class="alert alert-danger"
-                                {{--                     v-if="form.errors.length > 0"--}}
                         >
                             <p><strong>Whoops!</strong> Something went wrong!</p>
                             <br>
                             <ul>
                                 <li
-                                        {{--                                v-for="error in form.errors"--}}
                                 >
-                                    {{--                            {{ error }}--}}
+                                    @error('name') <span class="error">{{ $message }}</span> @enderror
                                 </li>
                             </ul>
                         </div>
@@ -90,7 +88,6 @@
 
                     <!-- Create Token Form -->
                     <form class="form-horizontal" role="form"
-                            {{--                      @submit.prevent="store"--}}
                     >
                         <!-- Name -->
                         <div class="form-group">
@@ -98,13 +95,15 @@
 
                             <div class="col-md-6">
                                 <input id="create-token-name" type="text" aria-label="name" class="form-control" name="name"
-                                       {{-- defer because it's submitting if i don't --}}
+                                       {{-- defer because it's submitting as i type if i don't --}}
                                        wire:model.defer="name"
                                 >
                             </div>
+
                         </div>
 
                         <!-- Scopes -->
+                        {{-- Seems like scopes was never working, I couldn't figure out how to enable the feature if it was --}}
                         {{--                    <div class="form-group"--}}
                         {{--                         v-if="scopes.length > 0"--}}
                         {{--                    >--}}
@@ -163,8 +162,8 @@
                     </p>
 
                     <pre><code>
-                            {{ $newTokenString }}
-                </code></pre>
+                            {{ e($newTokenString) }}
+                    </code></pre>
                 </div>
 
                 <!-- Modal Actions -->