2 files changed, 3 insertions, 0 deletions

diff --git a/app/controllers/otp_challenges_controller.rb b/app/controllers/otp_challenges_controller.rb
index 2526d1fb..5a834ed0 100644
--- a/app/controllers/otp_challenges_controller.rb
+++ b/app/controllers/otp_challenges_controller.rb
@@ -28,6 +28,8 @@ class OtpChallengesController < ApplicationController
       reset_session
       self.current_user = user
       session[:logged_in_at] = Time.now.to_i
+      user.update_column(:last_login_at, Time.now)
+
       # an admin who logs in and goes straight to user management
       # is already elevated
       elevate! if user.is_admin?
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index bb63c51e..00d19cdd 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -30,6 +30,7 @@ class SessionsController < ApplicationController
       else
         self.current_user = user
         session[:logged_in_at] = Time.now.to_i
+        user.update_column(:last_login_at, Time.now)
 
         if user.otp_required?
           flash[:error] = t("flash.sessions.otp_setup_now")