From eea191c8e26cbd29e05a086de42a45ecc82045b0 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Fri, 12 Dec 2025 14:47:29 +0100
Subject: [PATCH 01/14] Add fullname to v2 GET collaborators

---
 server/mergin/sync/models.py                   | 2 ++
 server/mergin/sync/public_api_v2.yaml          | 3 +++
 server/mergin/sync/public_api_v2_controller.py | 1 +
 server/mergin/sync/schemas.py                  | 1 +
 4 files changed, 7 insertions(+)

diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
index 9574a69d..5c427775 100644
--- a/server/mergin/sync/models.py
+++ b/server/mergin/sync/models.py
@@ -304,6 +304,7 @@ def get_member(self, user_id: int) -> Optional[ProjectMember]:
                 project_role=ProjectRole(member.role),
                 workspace_role=self.workspace.get_user_role(member.user),
                 role=ProjectPermissions.get_user_project_role(self, member.user),
+                fullname=member.user.profile.name(),
             )
 
     def members_by_role(self, role: ProjectRole) -> List[int]:
@@ -364,6 +365,7 @@ class ProjectMember:
     workspace_role: WorkspaceRole
     project_role: Optional[ProjectRole]
     role: ProjectRole
+    fullname: str
 
 
 @dataclass
diff --git a/server/mergin/sync/public_api_v2.yaml b/server/mergin/sync/public_api_v2.yaml
index bf3db007..9dfe7214 100644
--- a/server/mergin/sync/public_api_v2.yaml
+++ b/server/mergin/sync/public_api_v2.yaml
@@ -531,6 +531,9 @@ components:
           $ref: "#/components/schemas/ProjectRole"
         role:
           $ref: "#/components/schemas/Role"
+        fullname:
+          type: string
+          example: John Doe
     ProjectDetail:
       type: object
       required:
diff --git a/server/mergin/sync/public_api_v2_controller.py b/server/mergin/sync/public_api_v2_controller.py
index 217204c1..c5d55146 100644
--- a/server/mergin/sync/public_api_v2_controller.py
+++ b/server/mergin/sync/public_api_v2_controller.py
@@ -115,6 +115,7 @@ def get_project_collaborators(id):
                     project_role=project_role,
                     workspace_role=workspace_role,
                     role=ProjectPermissions.get_user_project_role(project, user),
+                    fullname=user.profile.name(),
                 )
             )
 
diff --git a/server/mergin/sync/schemas.py b/server/mergin/sync/schemas.py
index 8d1df050..661cd55b 100644
--- a/server/mergin/sync/schemas.py
+++ b/server/mergin/sync/schemas.py
@@ -405,6 +405,7 @@ class ProjectMemberSchema(Schema):
     project_role = fields.Enum(enum=ProjectRole, by_value=True)
     workspace_role = fields.Enum(enum=WorkspaceRole, by_value=True)
     role = fields.Enum(enum=ProjectRole, by_value=True)
+    fullname = fields.String()
 
 
 class UploadChunkSchema(Schema):

From 0f471489610148c5e8a6d08ec57e9fb53c0c7fbd Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Fri, 12 Dec 2025 14:48:24 +0100
Subject: [PATCH 02/14] Introduce UserSummary component and adjust project
 collaborators

---
 .../components/ProjectMembersTable.vue        | 37 ++++------------
 .../project/components/UserSummary.vue        | 44 +++++++++++++++++++
 .../packages/lib/src/modules/project/types.ts |  2 +-
 3 files changed, 54 insertions(+), 29 deletions(-)
 create mode 100644 web-app/packages/lib/src/modules/project/components/UserSummary.vue

diff --git a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
index e7e01062..c5dfafae 100644
--- a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
+++ b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
@@ -38,33 +38,18 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
           />
         </template>
 
-        <template #col-email="{ column, item }">
+        <template #col-member="{ column, item }">
           <div
             :class="[
               column.textClass,
               // Center texts with additional content Avatar - text
-              'flex align-items-center'
+              'flex align-items-center py-2'
             ]"
           >
-            <PAvatar
-              :label="$filters.getAvatar(item.email, item.username)"
-              shape="circle"
-              :pt="{
-                root: {
-                  class: 'mr-2 font-semibold text-color-forest flex-shrink-0',
-                  style: {
-                    borderRadius: '50%'
-                  }
-                }
-              }"
+            <ProjectMemberItem
+              :user="item"
+              :is-me="item.id === loggedUser.id"
             />
-            <span
-              >{{ item[column.value] }}
-              <template
-                v-if="column.value === 'email' && item.id === loggedUser.id"
-                >(me)</template
-              ></span
-            >
           </div>
         </template>
 
@@ -87,6 +72,7 @@ import { computed, ref, onUnmounted } from 'vue'
 
 import { useProjectStore } from '../store'
 import { ProjectCollaborator } from '../types'
+import ProjectMemberItem from './UserSummary.vue'
 
 import AppContainer from '@/common/components/AppContainer.vue'
 import AppDropdown from '@/common/components/AppDropdown.vue'
@@ -109,15 +95,10 @@ const instanceStore = useInstanceStore()
 const itemsPerPage = ref(10)
 const columns = ref<DataViewWrapperColumnItem[]>([
   {
-    text: 'Email address',
-    value: 'email',
+    text: 'Member',
+    value: 'member',
     textClass: 'font-semibold',
-    cols: 5
-  },
-  {
-    text: 'Username',
-    value: 'username',
-    cols: 5
+    cols: 10
   },
   {
     text: 'Project permissions',
diff --git a/web-app/packages/lib/src/modules/project/components/UserSummary.vue b/web-app/packages/lib/src/modules/project/components/UserSummary.vue
new file mode 100644
index 00000000..0cc6e2da
--- /dev/null
+++ b/web-app/packages/lib/src/modules/project/components/UserSummary.vue
@@ -0,0 +1,44 @@
+<template>
+  <div class="flex align-items-center w-full">
+    <PAvatar
+      :label="$filters.getAvatar(user.email, user.username)"
+      size="large"
+      shape="circle"
+      :pt="{
+        root: {
+          class: 'mr-2 text-color-forest font-semibold flex-shrink-0',
+          style: { borderRadius: '50%' }
+        }
+      }"
+    />
+
+    <div class="flex flex-column justify-content-between">
+      <p class="title-t4 overflow-wrap-anywhere">
+        {{
+          user.fullname
+            ? `${user.fullname} (${user.username})`
+            : user.username
+        }}
+      </p>
+
+      <p class="paragraph-p6 overflow-wrap-anywhere font-normal">
+        {{ user.email }}
+        <template v-if="isMe"> (me)</template>
+      </p>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+
+import { ProjectCollaborator } from '../types'
+
+defineProps({
+  user: Object as PropType<ProjectCollaborator>,
+  isMe: {
+    type: Boolean,
+    default: false
+  }
+})
+</script>
diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index 46e738b9..0a25db77 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/web-app/packages/lib/src/modules/project/types.ts
@@ -375,9 +375,9 @@ export interface ProjectCollaborator {
   workspace_role: WorkspaceRoleName
   project_role: ProjectRoleName | null
   role: ProjectRoleName
+  fullname: string
 }
 
-
 // router related types
 export interface ProjectRouteParams {
   namespace?: string

From 2ebcae8bf09be33754d714e0063602e021619433 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Thu, 18 Dec 2025 13:18:34 +0100
Subject: [PATCH 03/14] Integrate last_signed_in in admin - add attribute to
 API response - extend the schema - diplay the value on account detail page

---
 server/mergin/auth/api.yaml                        |  5 +++++
 server/mergin/auth/schemas.py                      |  1 +
 .../src/modules/admin/views/AccountDetailView.vue  | 14 +++++++++-----
 web-app/packages/lib/src/modules/user/types.ts     |  1 +
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/server/mergin/auth/api.yaml b/server/mergin/auth/api.yaml
index e0771689..fa482a36 100644
--- a/server/mergin/auth/api.yaml
+++ b/server/mergin/auth/api.yaml
@@ -753,6 +753,11 @@ components:
           type: string
           format: date-time
           example: 2023-07-30T08:47:58Z
+        last_signed_in:
+          nullable: true
+          type: string
+          format: date-time
+          example: 2025-12-18T08:47:58Z
         profile:
           $ref: "#/components/schemas/UserProfile"
     PaginatedUsers:
diff --git a/server/mergin/auth/schemas.py b/server/mergin/auth/schemas.py
index 3f614ae1..66eef924 100644
--- a/server/mergin/auth/schemas.py
+++ b/server/mergin/auth/schemas.py
@@ -70,6 +70,7 @@ class Meta:
             "profile",
             "scheduled_removal",
             "registration_date",
+            "last_signed_in",
         )
         load_instance = True
 
diff --git a/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue b/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
index cb283c78..871069a1 100644
--- a/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
+++ b/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
@@ -22,8 +22,12 @@
               }
             }"
           />
-          <h3 class="headline-h2" data-cy="profile-username">
-            {{ user?.username }}
+          <h3 class="headline-h2" data-cy="profile-name">
+            {{
+              profile?.name
+                ? `${profile.name} (${user.username})`
+                : user.username
+            }}
           </h3>
           <p
             class="m-0 paragraph-p6 overflow-wrap-anywhere"
@@ -43,9 +47,9 @@
             <div
               class="col-6 flex flex-column align-items-start text-left flex-wrap"
             >
-              <dt class="paragraph-p6 opacity-80 mb-2">Full name</dt>
-              <dd class="font-semibold" data-cy="profile-name">
-                {{ profile?.name || '-' }}
+              <dt class="paragraph-p6 opacity-80 mb-2">Last signed in</dt>
+              <dd class="font-semibold" data-cy="profile-last-signed-in">
+                {{ $filters.date(user?.last_signed_in) || '-' }}
               </dd>
             </div>
             <div class="col-6 flex flex-column align-items-end">
diff --git a/web-app/packages/lib/src/modules/user/types.ts b/web-app/packages/lib/src/modules/user/types.ts
index 2990212a..2bf668c6 100644
--- a/web-app/packages/lib/src/modules/user/types.ts
+++ b/web-app/packages/lib/src/modules/user/types.ts
@@ -46,6 +46,7 @@ export interface UserResponse {
   verified_email: boolean
   scheduled_removal?: null | string
   registration_date: string
+  last_signed_in: string
 }
 
 export interface UserWorkspace {

From ebe286aba512ea34675342effa072783cb6f4671 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Fri, 9 Jan 2026 15:28:59 +0100
Subject: [PATCH 04/14] add last_signed_in to API response

---
 server/mergin/sync/models.py                  |  1 +
 server/mergin/sync/private_api.yaml           |  6 +++
 server/mergin/sync/schemas.py                 |  1 +
 .../lib/src/common/components/index.ts        |  1 +
 .../components/ProjectMembersTable.vue        |  6 ++-
 .../project/components/UserSummary.vue        | 44 -------------------
 .../packages/lib/src/modules/project/types.ts |  1 +
 7 files changed, 14 insertions(+), 46 deletions(-)
 delete mode 100644 web-app/packages/lib/src/modules/project/components/UserSummary.vue

diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
index 5c427775..2ffea25a 100644
--- a/server/mergin/sync/models.py
+++ b/server/mergin/sync/models.py
@@ -378,6 +378,7 @@ class ProjectAccessDetail:
     workspace_role: str
     project_role: Optional[ProjectRole]
     type: str
+    last_signed_in: str
 
 
 class ProjectFilePath(db.Model):
diff --git a/server/mergin/sync/private_api.yaml b/server/mergin/sync/private_api.yaml
index 48a88933..4c799b3f 100644
--- a/server/mergin/sync/private_api.yaml
+++ b/server/mergin/sync/private_api.yaml
@@ -657,6 +657,12 @@ components:
               type: string
               format: date-time
               example: 2018-11-30T08:47:58.636074Z
+        last_signed_in:
+          description: Present only for type `member`
+          nullable: true
+          type: string
+          format: date-time
+          example: 2025-12-18T08:47:58Z
     ProjectAccessUpdated:
       type: object
       properties:
diff --git a/server/mergin/sync/schemas.py b/server/mergin/sync/schemas.py
index 661cd55b..5ad41a9a 100644
--- a/server/mergin/sync/schemas.py
+++ b/server/mergin/sync/schemas.py
@@ -364,6 +364,7 @@ class ProjectAccessDetailSchema(Schema):
     workspace_role = fields.Enum(enum=WorkspaceRole, by_value=True)
     type = fields.String()
     invitation = fields.Nested(ProjectInvitationAccessSchema())
+    last_signed_in = DateTimeWithZ()
 
 
 class ProjectVersionListSchema(ma.SQLAlchemyAutoSchema):
diff --git a/web-app/packages/lib/src/common/components/index.ts b/web-app/packages/lib/src/common/components/index.ts
index 790534e6..59677e76 100644
--- a/web-app/packages/lib/src/common/components/index.ts
+++ b/web-app/packages/lib/src/common/components/index.ts
@@ -16,6 +16,7 @@ export { default as FullStorageWarningTemplate } from './FullStorageWarningTempl
 export { default as TipMessage } from './TipMessage.vue'
 export { default as AppOnboardingPage } from './AppOnboardingPage.vue'
 export { default as UsageCard } from './UsageCard.vue'
+export { default as UserSummary } from './UserSummary.vue'
 export * from './types'
 export * from './data-view'
 export * from './app-settings'
diff --git a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
index c5dfafae..e2a356fa 100644
--- a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
+++ b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
@@ -47,7 +47,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
             ]"
           >
             <ProjectMemberItem
-              :user="item"
+              :username="item.username"
+              :full-name="item.fullname"
+              :email="item.email"
               :is-me="item.id === loggedUser.id"
             />
           </div>
@@ -70,9 +72,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 <script setup lang="ts">
 import { computed, ref, onUnmounted } from 'vue'
 
+import ProjectMemberItem from '../../../common/components/UserSummary.vue'
 import { useProjectStore } from '../store'
 import { ProjectCollaborator } from '../types'
-import ProjectMemberItem from './UserSummary.vue'
 
 import AppContainer from '@/common/components/AppContainer.vue'
 import AppDropdown from '@/common/components/AppDropdown.vue'
diff --git a/web-app/packages/lib/src/modules/project/components/UserSummary.vue b/web-app/packages/lib/src/modules/project/components/UserSummary.vue
deleted file mode 100644
index 0cc6e2da..00000000
--- a/web-app/packages/lib/src/modules/project/components/UserSummary.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="flex align-items-center w-full">
-    <PAvatar
-      :label="$filters.getAvatar(user.email, user.username)"
-      size="large"
-      shape="circle"
-      :pt="{
-        root: {
-          class: 'mr-2 text-color-forest font-semibold flex-shrink-0',
-          style: { borderRadius: '50%' }
-        }
-      }"
-    />
-
-    <div class="flex flex-column justify-content-between">
-      <p class="title-t4 overflow-wrap-anywhere">
-        {{
-          user.fullname
-            ? `${user.fullname} (${user.username})`
-            : user.username
-        }}
-      </p>
-
-      <p class="paragraph-p6 overflow-wrap-anywhere font-normal">
-        {{ user.email }}
-        <template v-if="isMe"> (me)</template>
-      </p>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-
-import { ProjectCollaborator } from '../types'
-
-defineProps({
-  user: Object as PropType<ProjectCollaborator>,
-  isMe: {
-    type: Boolean,
-    default: false
-  }
-})
-</script>
diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index 0a25db77..4482ec0a 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/web-app/packages/lib/src/modules/project/types.ts
@@ -366,6 +366,7 @@ export interface ProjectAccessDetail {
       permissions: ProjectPermissionName
     }
   }
+  last_signed_in: string
 }
 
 export interface ProjectCollaborator {

From ed6778705e9038cd7a927b5f8ae4032ba8ca083f Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Fri, 9 Jan 2026 15:30:17 +0100
Subject: [PATCH 05/14] introduce user card component

---
 .../lib/src/common/components/UserSummary.vue | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 web-app/packages/lib/src/common/components/UserSummary.vue

diff --git a/web-app/packages/lib/src/common/components/UserSummary.vue b/web-app/packages/lib/src/common/components/UserSummary.vue
new file mode 100644
index 00000000..f6eb0f9a
--- /dev/null
+++ b/web-app/packages/lib/src/common/components/UserSummary.vue
@@ -0,0 +1,37 @@
+<template>
+  <div class="flex align-items-center w-full">
+    <PAvatar
+      :label="$filters.getAvatar(email, fullName)"
+      size="large"
+      shape="circle"
+      :pt="{
+        root: {
+          class: 'mr-2 text-color-forest font-semibold flex-shrink-0',
+          style: { borderRadius: '50%' }
+        }
+      }"
+    />
+
+    <div class="flex flex-column justify-content-between">
+      <p class="title-t4 overflow-wrap-anywhere">
+        {{ fullName ? `${fullName} (${username})` : username }}
+      </p>
+
+      <p class="paragraph-p6 overflow-wrap-anywhere font-normal">
+        {{ email }}
+        <template v-if="isMe"> (me)</template>
+      </p>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+interface Props {
+  username: string
+  email: string
+  fullName?: string
+  isMe?: boolean
+}
+
+defineProps<Props>()
+</script>

From 72bdc7e873e2990c157e2bf1b6a5b7922136441b Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Tue, 13 Jan 2026 10:12:21 +0100
Subject: [PATCH 06/14] Use fullname for avatar

---
 .../admin-lib/src/modules/admin/views/AccountDetailView.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue b/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
index 871069a1..d3b537ff 100644
--- a/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
+++ b/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
@@ -13,7 +13,7 @@
         <div class="flex flex-column align-items-center row-gap-3 text-center">
           <PAvatar
             v-if="user"
-            :label="$filters.getAvatar(user?.email, user?.username)"
+            :label="$filters.getAvatar(user?.email, profile?.name)"
             size="xlarge"
             shape="circle"
             :pt="{
@@ -25,7 +25,7 @@
           <h3 class="headline-h2" data-cy="profile-name">
             {{
               profile?.name
-                ? `${profile.name} (${user.username})`
+                ? `${profile.name} (${user?.username})`
                 : user.username
             }}
           </h3>

From 424c6bc48517d40ccc13bb1428e663983b273a31 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Tue, 13 Jan 2026 14:23:53 +0100
Subject: [PATCH 07/14] Make fullname and last_signed_in optional

---
 server/mergin/auth/models.py                      | 2 +-
 server/mergin/auth/schemas.py                     | 2 +-
 server/mergin/sync/models.py                      | 2 +-
 server/mergin/sync/public_api_v2.yaml             | 1 +
 server/mergin/sync/workspace.py                   | 2 ++
 web-app/packages/lib/src/modules/project/types.ts | 4 ++--
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/server/mergin/auth/models.py b/server/mergin/auth/models.py
index 5dcf275e..470b934b 100644
--- a/server/mergin/auth/models.py
+++ b/server/mergin/auth/models.py
@@ -268,7 +268,7 @@ class UserProfile(db.Model):
         ),
     )
 
-    def name(self):
+    def name(self) -> Optional[str]:
         return f'{self.first_name if self.first_name else ""} {self.last_name if self.last_name else ""}'.strip()
 
 
diff --git a/server/mergin/auth/schemas.py b/server/mergin/auth/schemas.py
index 66eef924..52ed01f6 100644
--- a/server/mergin/auth/schemas.py
+++ b/server/mergin/auth/schemas.py
@@ -11,7 +11,7 @@
 
 class UserProfileSchema(ma.SQLAlchemyAutoSchema):
     name = ma.Function(
-        lambda obj: f'{obj.first_name if obj.first_name else ""} {obj.last_name if obj.last_name else ""}'.strip(),
+        lambda obj: obj.name(),
         dump_only=True,
     )
     storage = fields.Method("get_storage", dump_only=True)
diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
index 2ffea25a..2430c05e 100644
--- a/server/mergin/sync/models.py
+++ b/server/mergin/sync/models.py
@@ -378,7 +378,7 @@ class ProjectAccessDetail:
     workspace_role: str
     project_role: Optional[ProjectRole]
     type: str
-    last_signed_in: str
+    last_signed_in: Optional[datetime]
 
 
 class ProjectFilePath(db.Model):
diff --git a/server/mergin/sync/public_api_v2.yaml b/server/mergin/sync/public_api_v2.yaml
index 7f39cc4b..6e868805 100644
--- a/server/mergin/sync/public_api_v2.yaml
+++ b/server/mergin/sync/public_api_v2.yaml
@@ -529,6 +529,7 @@ components:
         role:
           $ref: "#/components/schemas/Role"
         fullname:
+          nullable: true
           type: string
           example: John Doe
     ProjectDetail:
diff --git a/server/mergin/sync/workspace.py b/server/mergin/sync/workspace.py
index 76245ef3..424194d0 100644
--- a/server/mergin/sync/workspace.py
+++ b/server/mergin/sync/workspace.py
@@ -341,6 +341,7 @@ def project_access(self, project: Project) -> List[ProjectAccessDetail]:
                 role=project_permission and project_permission.value,
                 project_role=project_role.value if project_role else None,
                 type="member",
+                last_signed_in=dm.last_signed_in,
             )
             result.append(member)
         if global_role:
@@ -355,6 +356,7 @@ def project_access(self, project: Project) -> List[ProjectAccessDetail]:
                     role=global_role,
                     project_role=None,
                     type="member",
+                    last_signed_in=gm.last_signed_in,
                 )
                 result.append(member)
         return result
diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index 4482ec0a..72058b02 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/web-app/packages/lib/src/modules/project/types.ts
@@ -366,7 +366,7 @@ export interface ProjectAccessDetail {
       permissions: ProjectPermissionName
     }
   }
-  last_signed_in: string
+  last_signed_in?: string
 }
 
 export interface ProjectCollaborator {
@@ -376,7 +376,7 @@ export interface ProjectCollaborator {
   workspace_role: WorkspaceRoleName
   project_role: ProjectRoleName | null
   role: ProjectRoleName
-  fullname: string
+  fullname?: string
 }
 
 // router related types

From a046c759391c8c4a94da7e2bdcdcf04200640b97 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Wed, 14 Jan 2026 10:01:52 +0100
Subject: [PATCH 08/14] Get last signed in when missing in admin

---
 server/mergin/auth/controller.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/mergin/auth/controller.py b/server/mergin/auth/controller.py
index 3e00ce16..0a862384 100644
--- a/server/mergin/auth/controller.py
+++ b/server/mergin/auth/controller.py
@@ -424,6 +424,9 @@ def register_user():  # pylint: disable=W0613,W0612
 @auth_required(permissions=["admin"])
 def get_user(username):
     user = User.query.filter(User.username == username).first_or_404()
+    if not user.last_signed_in:
+        last_signed_in = LoginHistory.get_users_last_signed_in([user.id])
+        user.last_signed_in = last_signed_in.get(user.id)
     data = UserSchema().dump(user)
     return data, 200
 

From 768d18e4deea3815dd6d7f926219cf246bcc97d3 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Wed, 14 Jan 2026 10:02:27 +0100
Subject: [PATCH 09/14] Rename fullname to name

---
 server/mergin/sync/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
index 2430c05e..b0820908 100644
--- a/server/mergin/sync/models.py
+++ b/server/mergin/sync/models.py
@@ -365,7 +365,7 @@ class ProjectMember:
     workspace_role: WorkspaceRole
     project_role: Optional[ProjectRole]
     role: ProjectRole
-    fullname: str
+    name: Optional[str]
 
 
 @dataclass

From f67d86e14364cb133297d5e8116dcec451228879 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Wed, 14 Jan 2026 10:02:59 +0100
Subject: [PATCH 10/14] Ensure we have user when rendering user details

---
 .../modules/admin/views/AccountDetailView.vue | 210 +++++++++---------
 1 file changed, 106 insertions(+), 104 deletions(-)

diff --git a/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue b/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
index d3b537ff..9096e9bb 100644
--- a/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
+++ b/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
@@ -7,120 +7,122 @@
         </template>
       </app-section>
     </app-container>
-
-    <app-container>
-      <app-section class="p-4">
-        <div class="flex flex-column align-items-center row-gap-3 text-center">
-          <PAvatar
-            v-if="user"
-            :label="$filters.getAvatar(user?.email, profile?.name)"
-            size="xlarge"
-            shape="circle"
-            :pt="{
-              root: {
-                class: 'font-semibold text-color-forest'
-              }
-            }"
-          />
-          <h3 class="headline-h2" data-cy="profile-name">
-            {{
-              profile?.name
-                ? `${profile.name} (${user?.username})`
-                : user.username
-            }}
-          </h3>
-          <p
-            class="m-0 paragraph-p6 overflow-wrap-anywhere"
-            data-cy="profile-email"
+    <template v-if="user">
+      <app-container>
+        <app-section class="p-4">
+          <div
+            class="flex flex-column align-items-center row-gap-3 text-center"
           >
-            <i
-              v-if="!user?.verified_email"
-              v-tooltip.top="{
-                value: 'Email verification status'
+            <PAvatar
+              :label="$filters.getAvatar(user?.email, profile?.name)"
+              size="xlarge"
+              shape="circle"
+              :pt="{
+                root: {
+                  class: 'font-semibold text-color-forest'
+                }
               }"
-              class="ti ti-alert-circle-filled"
-              style="color: var(--grape-color)"
-            ></i>
-            {{ user?.email }}
-          </p>
-          <dl class="profile-view-detail-list grid grid-nogutter paragraph-p5">
-            <div
-              class="col-6 flex flex-column align-items-start text-left flex-wrap"
+            />
+            <h3 class="headline-h2" data-cy="profile-name">
+              {{
+                profile?.name
+                  ? `${profile.name} (${user?.username})`
+                  : user.username
+              }}
+            </h3>
+            <p
+              class="m-0 paragraph-p6 overflow-wrap-anywhere"
+              data-cy="profile-email"
             >
-              <dt class="paragraph-p6 opacity-80 mb-2">Last signed in</dt>
-              <dd class="font-semibold" data-cy="profile-last-signed-in">
-                {{ $filters.date(user?.last_signed_in) || '-' }}
-              </dd>
-            </div>
-            <div class="col-6 flex flex-column align-items-end">
-              <dt class="paragraph-p6 opacity-80 mb-2">Registered</dt>
-              <dd class="font-semibold" data-cy="profile-registered">
-                {{ $filters.date(user?.registration_date) }}
-              </dd>
-            </div>
-          </dl>
-        </div>
-      </app-section>
-    </app-container>
-    <app-container v-if="userStore.loggedUser?.id !== user?.id">
-      <app-section>
-        <template #title>Advanced</template>
-
-        <app-settings :items="settingsItems">
-          <template #notifications>
-            <div class="flex-shrink-0 paragraph-p1">
-              <PInputSwitch
-                :model-value="profile?.receive_notifications"
-                disabled
-              />
-            </div>
-          </template>
-          <template #adminAccess>
-            <div class="flex-shrink-0 paragraph-p1">
+              <i
+                v-if="!user?.verified_email"
+                v-tooltip.top="{
+                  value: 'Email verification status'
+                }"
+                class="ti ti-alert-circle-filled"
+                style="color: var(--grape-color)"
+              ></i>
+              {{ user?.email }}
+            </p>
+            <dl class="profile-view-detail-list grid grid-nogutter paragraph-p5">
               <div
-                class="flex align-items-center flex-shrink-0"
-                data-cy="profile-notification"
+                class="col-6 flex flex-column align-items-start text-left flex-wrap"
               >
+                <dt class="paragraph-p6 opacity-80 mb-2">Last signed in</dt>
+                <dd class="font-semibold" data-cy="profile-last-signed-in">
+                  {{ $filters.date(user.last_signed_in) || '-' }}
+                </dd>
+              </div>
+              <div class="col-6 flex flex-column align-items-end">
+                <dt class="paragraph-p6 opacity-80 mb-2">Registered</dt>
+                <dd class="font-semibold" data-cy="profile-registered">
+                  {{ $filters.date(user?.registration_date) }}
+                </dd>
+              </div>
+            </dl>
+          </div>
+        </app-section>
+      </app-container>
+      <app-container v-if="userStore.loggedUser?.id !== user?.id">
+        <app-section>
+          <template #title>Advanced</template>
+
+          <app-settings :items="settingsItems">
+            <template #notifications>
+              <div class="flex-shrink-0 paragraph-p1">
+                <PInputSwitch
+                  :model-value="profile?.receive_notifications"
+                  disabled
+                />
+              </div>
+            </template>
+            <template #adminAccess>
+              <div class="flex-shrink-0 paragraph-p1">
+                <div
+                  class="flex align-items-center flex-shrink-0"
+                  data-cy="profile-notification"
+                >
+                  <PButton
+                    :severity="user?.is_admin ? 'danger' : 'warning'"
+                    :disabled="
+                      !instanceStore.configData?.enable_superadmin_assignment
+                    "
+                    @click="switchAdminAccess"
+                    :label="
+                      !user?.is_admin
+                        ? 'Grant admin access'
+                        : 'Revoke admin access'
+                    "
+                  />
+                </div>
+              </div>
+            </template>
+            <template #accountActivation>
+              <div class="flex-shrink-0">
                 <PButton
-                  :severity="user?.is_admin ? 'danger' : 'warning'"
-                  :disabled="
-                    !instanceStore.configData?.enable_superadmin_assignment
-                  "
-                  @click="switchAdminAccess"
+                  @click="changeStatusDialog"
+                  :severity="user?.active ? 'warning' : 'secondary'"
                   :label="
-                    !user?.is_admin
-                      ? 'Grant admin access'
-                      : 'Revoke admin access'
+                    user?.active ? 'Deactivate account' : 'Activate account'
                   "
+                  class="w-auto mr-1"
                 />
               </div>
-            </div>
-          </template>
-          <template #accountActivation>
-            <div class="flex-shrink-0">
-              <PButton
-                @click="changeStatusDialog"
-                :severity="user?.active ? 'warning' : 'secondary'"
-                :label="
-                  user?.active ? 'Deactivate account' : 'Activate account'
-                "
-                class="w-auto mr-1"
-              />
-            </div>
-          </template>
-          <template #deleteAccount>
-            <div class="flex-shrink-0">
-              <PButton
-                @click="confirmDeleteUser"
-                severity="danger"
-                data-cy="profile-close-account-btn"
-                label="Delete account"
-              />
-            </div>
-          </template>
-        </app-settings>
-      </app-section>
-    </app-container>
+            </template>
+            <template #deleteAccount>
+              <div class="flex-shrink-0">
+                <PButton
+                  @click="confirmDeleteUser"
+                  severity="danger"
+                  data-cy="profile-close-account-btn"
+                  label="Delete account"
+                />
+              </div>
+            </template>
+          </app-settings>
+        </app-section>
+      </app-container>
+    </template>
   </admin-layout>
 </template>
 

From 1ac849ff1498494fe421987ecdb636d9bdbc2162 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Wed, 14 Jan 2026 11:31:36 +0100
Subject: [PATCH 11/14] rename fullname to name 2

---
 server/mergin/sync/models.py                                | 2 +-
 server/mergin/sync/public_api_v2.yaml                       | 2 +-
 server/mergin/sync/public_api_v2_controller.py              | 2 +-
 server/mergin/sync/schemas.py                               | 2 +-
 web-app/packages/lib/src/common/components/UserSummary.vue  | 6 +++---
 .../src/modules/project/components/ProjectMembersTable.vue  | 2 +-
 web-app/packages/lib/src/modules/project/types.ts           | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
index b0820908..ce19d6d0 100644
--- a/server/mergin/sync/models.py
+++ b/server/mergin/sync/models.py
@@ -304,7 +304,7 @@ def get_member(self, user_id: int) -> Optional[ProjectMember]:
                 project_role=ProjectRole(member.role),
                 workspace_role=self.workspace.get_user_role(member.user),
                 role=ProjectPermissions.get_user_project_role(self, member.user),
-                fullname=member.user.profile.name(),
+                name=member.user.profile.name(),
             )
 
     def members_by_role(self, role: ProjectRole) -> List[int]:
diff --git a/server/mergin/sync/public_api_v2.yaml b/server/mergin/sync/public_api_v2.yaml
index 6e868805..fcce84d2 100644
--- a/server/mergin/sync/public_api_v2.yaml
+++ b/server/mergin/sync/public_api_v2.yaml
@@ -528,7 +528,7 @@ components:
           $ref: "#/components/schemas/ProjectRole"
         role:
           $ref: "#/components/schemas/Role"
-        fullname:
+        name:
           nullable: true
           type: string
           example: John Doe
diff --git a/server/mergin/sync/public_api_v2_controller.py b/server/mergin/sync/public_api_v2_controller.py
index ffd0d6fd..b6011746 100644
--- a/server/mergin/sync/public_api_v2_controller.py
+++ b/server/mergin/sync/public_api_v2_controller.py
@@ -114,7 +114,7 @@ def get_project_collaborators(id):
                     project_role=project_role,
                     workspace_role=workspace_role,
                     role=ProjectPermissions.get_user_project_role(project, user),
-                    fullname=user.profile.name(),
+                    name=user.profile.name(),
                 )
             )
 
diff --git a/server/mergin/sync/schemas.py b/server/mergin/sync/schemas.py
index 5ad41a9a..1dc6eb88 100644
--- a/server/mergin/sync/schemas.py
+++ b/server/mergin/sync/schemas.py
@@ -406,7 +406,7 @@ class ProjectMemberSchema(Schema):
     project_role = fields.Enum(enum=ProjectRole, by_value=True)
     workspace_role = fields.Enum(enum=WorkspaceRole, by_value=True)
     role = fields.Enum(enum=ProjectRole, by_value=True)
-    fullname = fields.String()
+    name = fields.String()
 
 
 class UploadChunkSchema(Schema):
diff --git a/web-app/packages/lib/src/common/components/UserSummary.vue b/web-app/packages/lib/src/common/components/UserSummary.vue
index f6eb0f9a..943fbe6b 100644
--- a/web-app/packages/lib/src/common/components/UserSummary.vue
+++ b/web-app/packages/lib/src/common/components/UserSummary.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex align-items-center w-full">
     <PAvatar
-      :label="$filters.getAvatar(email, fullName)"
+      :label="$filters.getAvatar(email, name)"
       size="large"
       shape="circle"
       :pt="{
@@ -14,7 +14,7 @@
 
     <div class="flex flex-column justify-content-between">
       <p class="title-t4 overflow-wrap-anywhere">
-        {{ fullName ? `${fullName} (${username})` : username }}
+        {{ name ? `${name} (${username})` : username }}
       </p>
 
       <p class="paragraph-p6 overflow-wrap-anywhere font-normal">
@@ -29,7 +29,7 @@
 interface Props {
   username: string
   email: string
-  fullName?: string
+  name?: string
   isMe?: boolean
 }
 
diff --git a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
index e2a356fa..ef994b92 100644
--- a/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
+++ b/web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue
@@ -48,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
           >
             <ProjectMemberItem
               :username="item.username"
-              :full-name="item.fullname"
+              :name="item.name"
               :email="item.email"
               :is-me="item.id === loggedUser.id"
             />
diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index 72058b02..d1b63276 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/web-app/packages/lib/src/modules/project/types.ts
@@ -376,7 +376,7 @@ export interface ProjectCollaborator {
   workspace_role: WorkspaceRoleName
   project_role: ProjectRoleName | null
   role: ProjectRoleName
-  fullname?: string
+  name?: string
 }
 
 // router related types

From 8ada302d2297535b8138a98da186e81c5ee61d78 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Wed, 14 Jan 2026 15:44:20 +0100
Subject: [PATCH 12/14] rm last_signed_in from collaborators

---
 server/mergin/sync/models.py    | 1 -
 server/mergin/sync/schemas.py   | 1 -
 server/mergin/sync/workspace.py | 2 --
 3 files changed, 4 deletions(-)

diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
index ce19d6d0..62e4c8b1 100644
--- a/server/mergin/sync/models.py
+++ b/server/mergin/sync/models.py
@@ -378,7 +378,6 @@ class ProjectAccessDetail:
     workspace_role: str
     project_role: Optional[ProjectRole]
     type: str
-    last_signed_in: Optional[datetime]
 
 
 class ProjectFilePath(db.Model):
diff --git a/server/mergin/sync/schemas.py b/server/mergin/sync/schemas.py
index 1dc6eb88..4eecca0c 100644
--- a/server/mergin/sync/schemas.py
+++ b/server/mergin/sync/schemas.py
@@ -364,7 +364,6 @@ class ProjectAccessDetailSchema(Schema):
     workspace_role = fields.Enum(enum=WorkspaceRole, by_value=True)
     type = fields.String()
     invitation = fields.Nested(ProjectInvitationAccessSchema())
-    last_signed_in = DateTimeWithZ()
 
 
 class ProjectVersionListSchema(ma.SQLAlchemyAutoSchema):
diff --git a/server/mergin/sync/workspace.py b/server/mergin/sync/workspace.py
index 424194d0..76245ef3 100644
--- a/server/mergin/sync/workspace.py
+++ b/server/mergin/sync/workspace.py
@@ -341,7 +341,6 @@ def project_access(self, project: Project) -> List[ProjectAccessDetail]:
                 role=project_permission and project_permission.value,
                 project_role=project_role.value if project_role else None,
                 type="member",
-                last_signed_in=dm.last_signed_in,
             )
             result.append(member)
         if global_role:
@@ -356,7 +355,6 @@ def project_access(self, project: Project) -> List[ProjectAccessDetail]:
                     role=global_role,
                     project_role=None,
                     type="member",
-                    last_signed_in=gm.last_signed_in,
                 )
                 result.append(member)
         return result

From e2fba85d2ff510bbc8a2c0f7594eb01e3d43b6b6 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Wed, 14 Jan 2026 15:44:43 +0100
Subject: [PATCH 13/14] UserSummary width to auto

---
 web-app/packages/lib/src/common/components/UserSummary.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-app/packages/lib/src/common/components/UserSummary.vue b/web-app/packages/lib/src/common/components/UserSummary.vue
index 943fbe6b..392c4f3e 100644
--- a/web-app/packages/lib/src/common/components/UserSummary.vue
+++ b/web-app/packages/lib/src/common/components/UserSummary.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex align-items-center w-full">
+  <div class="flex align-items-center w-auto">
     <PAvatar
       :label="$filters.getAvatar(email, name)"
       size="large"

From 513d9b6339165dc4741db58fb443c768ae85f634 Mon Sep 17 00:00:00 2001
From: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
Date: Wed, 14 Jan 2026 16:10:26 +0100
Subject: [PATCH 14/14] Gap in UserSummary to 10px

---
 web-app/packages/lib/src/common/components/UserSummary.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web-app/packages/lib/src/common/components/UserSummary.vue b/web-app/packages/lib/src/common/components/UserSummary.vue
index 392c4f3e..934b95e1 100644
--- a/web-app/packages/lib/src/common/components/UserSummary.vue
+++ b/web-app/packages/lib/src/common/components/UserSummary.vue
@@ -1,12 +1,12 @@
 <template>
-  <div class="flex align-items-center w-auto">
+  <div class="flex align-items-center w-auto" style="gap: 10px">
     <PAvatar
       :label="$filters.getAvatar(email, name)"
       size="large"
       shape="circle"
       :pt="{
         root: {
-          class: 'mr-2 text-color-forest font-semibold flex-shrink-0',
+          class: 'text-color-forest font-semibold flex-shrink-0',
           style: { borderRadius: '50%' }
         }
       }"