diff --git a/app/dashboard/templates/dashboard/directory.html b/app/dashboard/templates/dashboard/directory.html
index 90da7bed..9794c387 100644
--- a/app/dashboard/templates/dashboard/directory.html
+++ b/app/dashboard/templates/dashboard/directory.html
@@ -85,8 +85,7 @@
 
         {{ new_dir_form.name(class="form-control", placeholder="my-directory",
             pattern="[0-9a-z-_]{3,}",
-            title="Only letter, number, dash (-), underscore (_) can be used. Directory name must be at least 3 characters.",
-            autofocus="1") }}
+            title="Only letter, number, dash (-), underscore (_) can be used. Directory name must be at least 3 characters.") }}
         {{ render_field_errors(new_dir_form.name) }}
         <button class="btn btn-lg btn-success mt-2">Create</button>
       </form>
diff --git a/app/dashboard/templates/dashboard/mailbox.html b/app/dashboard/templates/dashboard/mailbox.html
index 95589d31..12727d32 100644
--- a/app/dashboard/templates/dashboard/mailbox.html
+++ b/app/dashboard/templates/dashboard/mailbox.html
@@ -85,8 +85,7 @@
           A verification email will be sent to this email to make sure you have access to this email.
         </div>
 
-        {{ new_mailbox_form.email(class="form-control", placeholder="email@example.com",
-            autofocus="1") }}
+        {{ new_mailbox_form.email(class="form-control", placeholder="email@example.com") }}
         {{ render_field_errors(new_mailbox_form.email) }}
         <button class="btn btn-lg btn-success mt-2">Create</button>
       </form>