diff --git a/templates/app/views/user_passwords/edit.html.erb b/templates/app/views/user_passwords/edit.html.erb
index 0f019a65..ce618c01 100644
--- a/templates/app/views/user_passwords/edit.html.erb
+++ b/templates/app/views/user_passwords/edit.html.erb
@@ -18,7 +18,7 @@
       <div class="text-center flex flex-col gap-6 items-center">
         <%= f.button t("spree.update"),
           name: :commit,
-          class: 'w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700'
+          class: 'w-full w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700'
         %>
       </div>
 
diff --git a/templates/app/views/user_passwords/new.html.erb b/templates/app/views/user_passwords/new.html.erb
index 92a20ea4..065683d8 100644
--- a/templates/app/views/user_passwords/new.html.erb
+++ b/templates/app/views/user_passwords/new.html.erb
@@ -11,7 +11,7 @@
       <div class="text-center flex flex-col gap-6 items-center">
         <%= f.button(
           t("spree.reset_password"),
-          class: 'w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700',
+          class: 'w-full w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700',
           name: :commit
         ) %>
       </div>
diff --git a/templates/app/views/user_registrations/new.html.erb b/templates/app/views/user_registrations/new.html.erb
index e961dc69..353ba9e8 100644
--- a/templates/app/views/user_registrations/new.html.erb
+++ b/templates/app/views/user_registrations/new.html.erb
@@ -23,7 +23,7 @@
       <div class="text-center flex flex-col gap-6 items-center">
         <%= f.button t("spree.create"),
           name: :commit,
-          class: 'w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700'
+          class: 'w-full w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700'
         %>
       </div>
 
diff --git a/templates/app/views/user_sessions/new.html.erb b/templates/app/views/user_sessions/new.html.erb
index 442e4b73..1e9443db 100644
--- a/templates/app/views/user_sessions/new.html.erb
+++ b/templates/app/views/user_sessions/new.html.erb
@@ -2,9 +2,12 @@
 
 <article class="wrapper grid-container py-12" id="existing-customer">
   <div class="col-span-full md:col-start-5 md:col-span-4">
-    <h1 class="font-serif text-h4 md:text-h3 text-center"><%= I18n.t('spree.login_as_existing') %></h1>
+    <h1 class="font-serif text-h4 md:text-h3"><%= I18n.t('spree.login_as_existing') %></h1>
+    <div class="mt-6">
+      <%= I18n.t("spree.or") %> <%= link_to I18n.t("spree.create_a_new_account"), signup_path, class:"transition-all duration-300 text-black hover:!text-red-500 dark:text-sand underline" %>
+    </div>
 
-    <%= form_for Spree::User.new, as: :spree_user, url: create_new_session_path, html: { class: "space-y-6 mb-12" } do |f| %>
+    <%= form_for Spree::User.new, as: :spree_user, url: create_new_session_path, html: { class: "space-y-6" } do |f| %>
       <div class="text-input">
         <%= f.label :email, "#{t("spree.email")}:" %>
         <%= f.email_field :email, placeholder: 'name@example.com' %>
@@ -15,22 +18,21 @@
         <%= f.password_field :password, placeholder: "p455w0rd" %>
       </div>
 
-      <div class="flex items-center leading-none gap-2">
-        <%= f.check_box :remember_me, tabindex: 3 %>
-        <%= f.label :remember_me, I18n.t("spree.remember_me"), class: "mb-0" %>
+      <div class="flex justify-between">
+        <div class="items-center leading-none py-1">
+          <%= f.check_box :remember_me, tabindex: 3 %>
+          <%= f.label :remember_me, I18n.t("spree.remember_me"), class: "mb-0" %>
+        </div>
+        <div></div>
+        <%= link_to I18n.t("spree.forgot_password"), recover_password_path, class:"transition-all duration-300 text-black hover:!text-red-500 dark:text-sand underline" %>
       </div>
 
       <div class="text-center flex flex-col gap-6 items-center">
         <%= f.button(
           t("spree.login"),
-          class: 'w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700',
+          class: 'w-full py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700',
           name: :commit
         ) %>
-        <%= link_to I18n.t("spree.forgot_password"), recover_password_path, class:"transition-all duration-300 text-black hover:!text-red-500 dark:text-sand underline" %>
-      </div>
-
-      <div class="mt-12 text-center">
-        <%= I18n.t("spree.or") %> <%= link_to I18n.t("spree.create_a_new_account"), signup_path, class:"transition-all duration-300 text-black hover:!text-red-500 dark:text-sand underline" %>
       </div>
 
     <% end %>