diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 26180093a..12515da38 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -20,17 +20,9 @@
                     @env('local')
                     <x-forms.input required value="test@example.com" type="email" name="email"
                         label="{{ __('input.email') }}" autofocus />
-                    {{-- @if (config('mail.default'))
-                        {{ dd('mailer configured') }}
-                    @else
-                        {{ dd('mailer not configured') }}
-                    @endif --}}
-
-                    @if (!config('mail.default'))
-                        <a href="/forgot-password" class="text-xs">
-                            {{ __('auth.forgot_password') }}?
-                        </a>
-                    @endif
+                    <a href="/forgot-password" class="text-xs">
+                        {{ __('auth.forgot_password') }}?
+                    </a>
                     <x-forms.input required value="password" type="password" name="password"
                         label="{{ __('input.password') }}" />
                 @else
diff --git a/resources/views/components/forms/button.blade.php b/resources/views/components/forms/button.blade.php
index 09f48b959..306f1f1b6 100644
--- a/resources/views/components/forms/button.blade.php
+++ b/resources/views/components/forms/button.blade.php
@@ -16,7 +16,9 @@
             @isset($confirmAction)
         x-on:{{ explode('(', $confirmAction)[0] }}.window="$wire.{{ explode('(', $confirmAction)[0] }}"
     @endisset>
-            <span wire:target="submit" wire:loading.delay class="loading loading-spinner"></span>
+            @if ($attributes->whereStartsWith('wire:click')->first())
+                <span wire:target="submit" wire:loading.delay class="loading loading-spinner"></span>
+            @endif
             {{ $slot }}
         </button>
     @elseif($type === 'button')
@@ -27,8 +29,10 @@
             @isset($confirmAction)
         x-on:{{ explode('(', $confirmAction)[0] }}.window="$wire.{{ explode('(', $confirmAction)[0] }}"
     @endisset>
-            <span wire:target="{{ explode('(', $attributes->whereStartsWith('wire:click')->first())[0] }}"
-                wire:loading.delay class="loading loading-spinner"></span>
+            @if ($attributes->whereStartsWith('wire:click')->first())
+                <span wire:target="{{ explode('(', $attributes->whereStartsWith('wire:click')->first())[0] }}"
+                    wire:loading.delay class="loading loading-spinner"></span>
+            @endif
             {{ $slot }}
         </button>
     @endif