diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 40505c77a..2c61581c6 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -8,24 +8,25 @@
                 <div class="p-6 space-y-4 md:space-y-6 sm:p-8">
                     <form action="/login" method="POST" class="flex flex-col gap-2">
                         @csrf
-                        {{-- @env('local')
-                        <x-forms.input value="test@example.com" type="email" name="email" required
+                        @env('local')
+                        <x-forms.input value="test@example.com" type="email" autocomplete="email" name="email"
+                            required label="{{ __('input.email') }}" autofocus />
+
+                        <x-forms.input value="password" type="password" autocomplete="current-password" name="password"
+                            required label="{{ __('input.password') }}" />
+
+                        <a href="/forgot-password" class="text-xs">
+                            {{ __('auth.forgot_password') }}?
+                        </a>
+                    @else
+                        <x-forms.input type="email" name="email" autocomplete="email" required
                             label="{{ __('input.email') }}" autofocus />
-
-                        <x-forms.input value="password" type="password" name="password" required
+                        <x-forms.input type="password" name="password" autocomplete="current-password" required
                             label="{{ __('input.password') }}" />
-
                         <a href="/forgot-password" class="text-xs">
                             {{ __('auth.forgot_password') }}?
                         </a>
-                    @else --}}
-                        <x-forms.input type="email" name="email" autocomplete="email" required label="{{ __('input.email') }}"
-                            autofocus />
-                        <x-forms.input type="password" name="password" autocomplete="current-password"  required label="{{ __('input.password') }}" />
-                        <a href="/forgot-password" class="text-xs">
-                            {{ __('auth.forgot_password') }}?
-                        </a>
-                        {{-- @endenv --}}
+                        @endenv
                         <x-forms.button class="mt-10" type="submit">{{ __('auth.login') }}</x-forms.button>
 
                         @if (!$is_registration_enabled)
diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
index f6b255a9f..2c6c1ef49 100644
--- a/resources/views/components/forms/input.blade.php
+++ b/resources/views/components/forms/input.blade.php
@@ -3,7 +3,7 @@
     'w-full' => !$isMultiline,
 ])>
     @if ($label)
-        <label for="small-input" class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
+        <label class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
             @if ($required)
                 <x-highlighted text="*" />
             @endif
diff --git a/resources/views/components/forms/select.blade.php b/resources/views/components/forms/select.blade.php
index 1159830bf..0a19923fc 100644
--- a/resources/views/components/forms/select.blade.php
+++ b/resources/views/components/forms/select.blade.php
@@ -1,6 +1,6 @@
 <div class="w-full">
     @if ($label)
-        <label for="small-input" class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
+        <label class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
             @if ($required)
                 <x-highlighted text="*" />
             @endif
diff --git a/resources/views/components/forms/textarea.blade.php b/resources/views/components/forms/textarea.blade.php
index 86f24302f..e9bc4e8c1 100644
--- a/resources/views/components/forms/textarea.blade.php
+++ b/resources/views/components/forms/textarea.blade.php
@@ -1,6 +1,6 @@
 <div class="flex-1 form-control">
     @if ($label)
-        <label for="small-input" class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
+        <label class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
             @if ($required)
                 <x-highlighted text="*" />
             @endif