diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index 81a4b808bf..dcb760ef94 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -151,9 +151,9 @@
         @endif
     @endif
     <template x-teleport="body">
-        <div x-show="modalOpen"
+        <div x-show="modalOpen" @click.away="modalOpen = false; resetModal()"
             class="fixed top-0 lg:pt-10 left-0 z-[99] flex items-start justify-center w-screen h-screen" x-cloak>
-            <div x-show="modalOpen"
+            <div x-show="modalOpen" @click="modalOpen = false; resetModal()"
                 class="absolute inset-0 w-full h-full bg-black bg-opacity-20 backdrop-blur-sm"></div>
             <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
                 x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
@@ -222,12 +222,12 @@
                                 </template>
                             @endforeach
                         </ul>
-                        @if ($confirmWithText && $confirmationText)
+                        @if ($confirmWithText)
                             <div class="mb-4">
                                 <h4 class="mb-2 text-lg font-semibold">Confirm Actions</h4>
                                 <p class="mb-2 text-sm">{{ $confirmationLabel }}</p>
                                 <div class="relative mb-2">
-                                    <input autocomplete="off" type="text" x-model="confirmationText"
+                                    <input type="text" x-model="confirmationText"
                                         class="p-2 pr-10 w-full text-black rounded cursor-text input" readonly>
                                     <button @click="copyConfirmationText()"
                                         class="absolute right-2 top-1/2 text-gray-500 transform -translate-y-1/2 hover:text-gray-700"
@@ -255,7 +255,7 @@
                                     class="block mt-4 text-sm font-medium text-gray-700 dark:text-gray-300">
                                     {{ $shortConfirmationLabel }}
                                 </label>
-                                <input autocomplete="off" type="text" x-model="userConfirmationText"
+                                <input type="text" x-model="userConfirmationText"
                                     class="p-2 mt-1 w-full text-black rounded input">
                             </div>
                         @endif
@@ -272,7 +272,7 @@
                                 class="block text-sm font-medium text-gray-700 dark:text-gray-300">
                                 Your Password
                             </label>
-                            <input autocomplete="off" type="password" id="password-confirm" x-model="password" class="w-full input"
+                            <input type="password" id="password-confirm" x-model="password" class="w-full input"
                                 placeholder="Enter your password">
                             <p x-show="passwordError" x-text="passwordError" class="mt-1 text-sm text-red-500"></p>
                             @error('password')
@@ -296,19 +296,13 @@
                     </template>
 
                     <template x-if="step === 1">
-                        @if(isDev() && str($submitAction)->contains('delete'))
-                            <x-forms.button class="w-auto" isError wire:click="{{ $submitAction }}('hello')">
-                                <span x-text="step3ButtonText"></span>
-                            </x-forms.button>
-                        @else
-                            <x-forms.button @click="step++" class="w-auto" isError>
-                                <span x-text="step1ButtonText"></span>
-                            </x-forms.button>
-                        @endif
+                        <x-forms.button @click="step++" class="w-auto" isError>
+                            <span x-text="step1ButtonText"></span>
+                        </x-forms.button>
                     </template>
 
                     <template x-if="step === 2">
-                        <x-forms.button x-bind:disabled="confirmationText !== ''  && userConfirmationText !== confirmationText"
+                        <x-forms.button x-bind:disabled="confirmWithText && userConfirmationText !== confirmationText"
                             class="w-auto" isError
                             @click="
                             if (dispatchEvent) {