From 76bbfe1b736b2e53d2f2c9473a00fbb06d1d504c Mon Sep 17 00:00:00 2001
From: Arpan Mukherjee <arpanmukherjee255@gmail.com>
Date: Sun, 29 Mar 2026 23:24:47 +0530
Subject: [PATCH] Fix login tab order by moving 'Lost your password?' link

---
 app/views/sessions/new.html.erb | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 227aeebe8..b836de28c 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -48,20 +48,15 @@
 
   <%= f.text_field :username, :label => t(".email or username"), :autofocus => true, :value => params[:username] %>
 
+  <%= f.password_field :password, :label => t(".password"), :autocomplete => "on", :value => "" %>
+
   <div class="d-flex flex-wrap column-gap-3 justify-content-between align-items-baseline mb-2">
-    <%= f.label :password, t(".password") %>
+    <%= f.form_group do %>
+      <%= f.check_box :remember_me, { :label => t(".remember"), :checked => (params[:remember_me] == "true") }, "yes" %>
+      <%= f.primary t(".login_button") %>
+    <% end %>
     <small><%= link_to(t(".lost password link"), user_forgot_password_path) %></small>
   </div>
-
-  <%= f.password_field :password, :autocomplete => "on", :value => "", :skip_label => true %>
-
-  <%= f.form_group do %>
-    <%= f.check_box :remember_me, { :label => t(".remember"), :checked => (params[:remember_me] == "true") }, "yes" %>
-  <% end %>
-
-  <div class="mb-3">
-    <%= f.primary t(".login_button") %>
-  </div>
 <% end %>
 
 <% unless @preferred_auth_provider or Auth.providers.empty? %>
-- 
2.39.5