diff --git a/app/models/user.rb b/app/models/user.rb
index dfbc8ed79..b504db9bc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -167,11 +167,6 @@ class User < ApplicationRecord
     update!(
       active: true,
       reactivate_with_organisation: false,
-      # resetting these fields ensures that the 'resend confirmation instructions' button shows
-      # we have this button be based on sign in date than confirmation status to ensure that the
-      # user has successfully completed the entire login flow before we hide the button
-      last_sign_in_at: nil,
-      last_sign_in_ip: nil,
     )
   end
 
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 78f2a06d3..e9f5855bb 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -154,7 +154,7 @@
       <div class="govuk-button-group">
         <% if @user.active? %>
           <%= govuk_button_link_to "Deactivate user", deactivate_user_path(@user), warning: true %>
-          <% if current_user.support? && @user.last_sign_in_at.nil? %>
+          <% if current_user.support? && (@user.last_sign_in_at.nil? || !@user.confirmed?) %>
             <%= govuk_button_to "Resend invite link", resend_invite_user_path(@user), secondary: true %>
           <% end %>
         <% else %>