diff --git a/resources/js/Pages/Auth/Login.vue b/resources/js/Pages/Auth/Login.vue
index 42d3197b4f5..90b24c44db6 100644
--- a/resources/js/Pages/Auth/Login.vue
+++ b/resources/js/Pages/Auth/Login.vue
@@ -76,7 +76,7 @@ const reload = () => {
     </div>
 
     <!-- beta mode-->
-    <div class="mb-4 rounded-lg border bg-amber-50 p-6">
+    <div class="mb-4 rounded-lg border bg-amber-50 p-6 dark:bg-amber-950">
       <p class="mb-2 text-center font-bold">
         <span class="me-2">🚧</span> {{ $t('Chandler is in beta.') }}
         <span class="ms-2">🚧</span>
@@ -133,7 +133,7 @@ const reload = () => {
                 :autofocus="true"
                 :input-class="'block w-full'"
                 :required="true"
-                :autocomplete="false"
+                autocomplete="username"
                 :maxlength="255" />
             </div>
 
@@ -142,10 +142,9 @@ const reload = () => {
                 v-model="form.password"
                 :label="$t('Password')"
                 :type="'password'"
-                :autofocus="true"
                 :input-class="'block w-full'"
                 :required="true"
-                :autocomplete="false"
+                autocomplete="current-password"
                 :maxlength="255" />
             </div>
 
diff --git a/resources/js/Shared/Form/TextInput.vue b/resources/js/Shared/Form/TextInput.vue
index fe8efd2478f..7fc29a09099 100644
--- a/resources/js/Shared/Form/TextInput.vue
+++ b/resources/js/Shared/Form/TextInput.vue
@@ -26,8 +26,8 @@ const props = defineProps({
   disabled: Boolean,
   autofocus: Boolean,
   autocomplete: {
-    type: Boolean,
-    default: true,
+    type: [String, Boolean],
+    default: '',
   },
   maxlength: Number,
   min: Number,
@@ -98,7 +98,7 @@ defineExpose({ focus: focus });
         :maxlength="maxlength"
         :required="required"
         :autofocus="autofocus"
-        :autocomplete="autocomplete ? '' : 'off'"
+        :autocomplete="typeof autocomplete === 'string' ? autocomplete : autocomplete ? '' : 'off'"
         :disabled="disabled"
         :min="min"
         :max="max"