diff --git a/engine/users.go b/engine/users.go
index fde6fd04b..94b505e7d 100644
--- a/engine/users.go
+++ b/engine/users.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/deluan/navidrome/log"
 	"github.com/deluan/navidrome/model"
 )
 
@@ -49,11 +48,12 @@ func (u *users) Authenticate(ctx context.Context, username, pass, token, salt st
 	if !valid {
 		return nil, model.ErrInvalidAuth
 	}
-	go func() {
-		err := u.ds.User(ctx).UpdateLastAccessAt(user.ID)
-		if err != nil {
-			log.Error(ctx, "Could not update user's lastAccessAt", "user", user.UserName)
-		}
-	}()
+	// TODO: Find a way to update LastAccessAt without causing too much retention in the DB
+	//go func() {
+	//	err := u.ds.User(ctx).UpdateLastAccessAt(user.ID)
+	//	if err != nil {
+	//		log.Error(ctx, "Could not update user's lastAccessAt", "user", user.UserName)
+	//	}
+	//}()
 	return user, nil
 }
diff --git a/ui/src/user/UserEdit.js b/ui/src/user/UserEdit.js
index e2dd582bb..a84b22aa0 100644
--- a/ui/src/user/UserEdit.js
+++ b/ui/src/user/UserEdit.js
@@ -23,7 +23,7 @@ const UserEdit = (props) => (
       <PasswordInput source="password" validate={[required()]} />
       <BooleanInput source="isAdmin" initialValue={false} />
       <DateField source="lastLoginAt" showTime />
-      <DateField source="lastAccessAt" showTime />
+      {/*<DateField source="lastAccessAt" showTime />*/}
       <DateField source="updatedAt" showTime />
       <DateField source="createdAt" showTime />
     </SimpleForm>
diff --git a/ui/src/user/UserList.js b/ui/src/user/UserList.js
index e978d99bc..40ff4af90 100644
--- a/ui/src/user/UserList.js
+++ b/ui/src/user/UserList.js
@@ -33,8 +33,7 @@ const UserList = (props) => {
         <SimpleList
           primaryText={(record) => record.name}
           secondaryText={(record) =>
-            record.lastAccessAt &&
-            new Date(record.lastAccessAt).toLocaleString()
+            record.lastLoginAt && new Date(record.lastLoginAt).toLocaleString()
           }
           tertiaryText={(record) => (record.isAdmin ? '[admin]️' : '')}
         />
@@ -42,7 +41,7 @@ const UserList = (props) => {
         <Datagrid rowClick="edit">
           <TextField source="userName" />
           <BooleanField source="isAdmin" />
-          <DateField source="lastAccessAt" locales="pt-BR" />
+          <DateField source="lastLoginAt" locales="pt-BR" />
           <DateField source="updatedAt" locales="pt-BR" />
         </Datagrid>
       )}