diff --git a/module/VuFind/sql/migrations/pgsql/5.0/002-modify-user-columns.sql b/module/VuFind/sql/migrations/pgsql/5.0/002-modify-user-columns.sql
new file mode 100644
index 0000000000000000000000000000000000000000..da5edf586708384f514593e1d03292a60300d460
--- /dev/null
+++ b/module/VuFind/sql/migrations/pgsql/5.0/002-modify-user-columns.sql
@@ -0,0 +1,7 @@
+--
+-- Modifications to table `user`
+--
+
+ALTER TABLE "user"
+  ADD COLUMN last_login timestamp NOT NULL DEFAULT '1970-01-01 00:00:00',
+  ADD COLUMN auth_method varchar(50) DEFAULT NULL;
diff --git a/module/VuFind/sql/mysql.sql b/module/VuFind/sql/mysql.sql
index fcda4275e2b0e59ac7d1925c8bed14397b658979..56e252d06fddee7bb4096523963eb6ca312e0391 100644
--- a/module/VuFind/sql/mysql.sql
+++ b/module/VuFind/sql/mysql.sql
@@ -198,6 +198,8 @@ CREATE TABLE `user` (
   `home_library` varchar(100) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
   `verify_hash` varchar(42) NOT NULL DEFAULT '',
+  `last_login` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `auth_method` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `username` (`username`),
   UNIQUE KEY `cat_id` (`cat_id`)
diff --git a/module/VuFind/sql/pgsql.sql b/module/VuFind/sql/pgsql.sql
index e4e039699e08fcb237c03462f968e1d00f16a841..76d41610e8dafd9c6a00ab16532f479ded9f9de5 100644
--- a/module/VuFind/sql/pgsql.sql
+++ b/module/VuFind/sql/pgsql.sql
@@ -123,6 +123,8 @@ major varchar(100) NOT NULL DEFAULT '',
 home_library varchar(100) NOT NULL DEFAULT '',
 created timestamp NOT NULL DEFAULT '1970-01-01 00:00:00',
 verify_hash varchar(42) NOT NULL DEFAULT '',
+last_login timestamp NOT NULL DEFAULT '1970-01-01 00:00:00',
+auth_method varchar(50) DEFAULT NULL,
 PRIMARY KEY (id),
 UNIQUE (username),
 UNIQUE (cat_id)
diff --git a/module/VuFind/src/VuFind/Auth/Manager.php b/module/VuFind/src/VuFind/Auth/Manager.php
index 4618d6da29d9ca4ce3e9ffd6fbd3f27cf6ded31b..73b58bc5dea79f108cf5ec4677cd1b99fafe8ed8 100644
--- a/module/VuFind/src/VuFind/Auth/Manager.php
+++ b/module/VuFind/src/VuFind/Auth/Manager.php
@@ -515,6 +515,7 @@ class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
     public function create($request)
     {
         $user = $this->getAuth()->create($request);
+        $this->updateUser($user);
         $this->updateSession($user);
         return $user;
     }
@@ -578,6 +579,9 @@ class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
             throw new AuthException('authentication_error_technical');
         }
 
+        // Update user object
+        $this->updateUser($user);
+
         // Store the user in the session and send it back to the caller:
         $this->updateSession($user);
         return $user;
@@ -627,4 +631,23 @@ class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
     {
         return $this->getAuth()->validateCredentials($request);
     }
+
+    /**
+     * Update common user attributes on login
+     *
+     * @param \VuFind\Db\Row\User $user User object
+     *
+     * @return void
+     */
+    protected function updateUser($user)
+    {
+        if ($this->getAuth() instanceof ChoiceAuth) {
+            $method = $this->getAuth()->getSelectedAuthOption();
+        } else {
+            $method = $this->activeAuth;
+        }
+        $user->auth_method = strtolower($method);
+        $user->last_login = date('Y-m-d H:i:s');
+        $user->save();
+    }
 }