diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8c1d1b29c6..153ac84be5 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -96,7 +96,7 @@ def sms_acct_creation_notice(resource_name, sms_status)
   end
 
   def store_referring_location
-    session[:return_to] = request.referer
+    session[:return_to] = request.referer unless request.referer.end_with?("users/sign_in")
   end
 
   def redirect_back_to_referer(fallback_location:)
diff --git a/app/views/case_contacts/form/expenses.html.erb b/app/views/case_contacts/form/expenses.html.erb
index 95da986c1b..b515a1a013 100644
--- a/app/views/case_contacts/form/expenses.html.erb
+++ b/app/views/case_contacts/form/expenses.html.erb
@@ -134,13 +134,13 @@
                   </div>
                 <% end %>
               <% end %>
-              </ol>
-
-              <button type="button" class="btn-sm main-btn primary-btn-outline btn-hover" id="add-another-expense">+ Add Another Expense</button>
             <% end %>
-            </div>
-      <% end %>
-    </div>
+          </ol>
+
+          <button type="button" class="btn-sm main-btn primary-btn-outline btn-hover" id="add-another-expense">+ Add Another Expense</button>
+        </div>
+      </div>
+    <% end %>
 
     <div class="actions mb-10 d-flex justify-content-end gap-2">
       <%= link_to previous_wizard_path(case_contact_id: @case_contact.id), class: "btn-sm main-btn primary-btn-outline btn-hover" do %>