diff --git a/.env.template b/.env.template
index 41414d81f5..5ffd90cfc6 100644
--- a/.env.template
+++ b/.env.template
@@ -31,7 +31,6 @@ FRA_GOOGLE_CLIENT_SECRET=goggle-client-secret
 FRA_GOOGLE_MAPS_API_KEY=google-maps-api-key
 
 #FRA
-FRA_ATLANTIS_ALLOWED='[{"assessmentName":"fra","cycleName":"2025"}]'
 FRA_REPORT_COLLABORATORS_EXCLUDED=[]
 
 # Local development mail server
diff --git a/package.json b/package.json
index 3e4b317c8c..bba1da8a41 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "ts-node-dev": "^2.0.0",
     "tsc-alias": "^1.8.6",
     "turndown": "^7.1.1",
-    "typescript": "^4.6.3",
+    "typescript": "^5.7.2",
     "webpack": "^5.71.0",
     "webpack-bundle-analyzer": "^4.4.2",
     "webpack-cli": "^4.7.2",
diff --git a/src/client/components/AreaSelector/CountryList/hooks/useUserCountryISOs.tsx b/src/client/components/AreaSelector/CountryList/hooks/useUserCountryISOs.tsx
index d9abd3d502..acb75c58de 100644
--- a/src/client/components/AreaSelector/CountryList/hooks/useUserCountryISOs.tsx
+++ b/src/client/components/AreaSelector/CountryList/hooks/useUserCountryISOs.tsx
@@ -1,4 +1,4 @@
-import { CountryIso } from 'meta/area'
+import { Areas, CountryIso } from 'meta/area'
 import { Cycles, CycleUuid } from 'meta/assessment'
 import { RoleName, Users } from 'meta/user'
 import { UserRoles } from 'meta/user/userRoles'
@@ -37,7 +37,7 @@ export const useUserCountryISOs = (): Record<CycleUuid, Record<string, Array<Cou
       // For no user role, show only current cycle countries
       userCountryISOs[UserRoles.noRole.role][cycle.uuid] = allCountries
         .map((c) => c.countryIso)
-        .filter((countryIso: CountryIso) => !userCountries?.includes(countryIso))
+        .filter((countryIso: CountryIso) => !Areas.isAtlantis(countryIso) && !userCountries?.includes(countryIso))
     }
   }
 
diff --git a/src/client/components/Avatar/Avatar.scss b/src/client/components/Avatar/Avatar.scss
new file mode 100644
index 0000000000..bcee4349d5
--- /dev/null
+++ b/src/client/components/Avatar/Avatar.scss
@@ -0,0 +1,15 @@
+@import 'src/client/style/partials';
+
+.user-avatar {
+  width: 28px;
+  height: 28px;
+  border-radius: 50%;
+  overflow: hidden;
+
+  img {
+    box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+    height: 100%;
+    object-fit: cover;
+    width: 100%;
+  }
+}
diff --git a/src/client/components/Avatar/Avatar.tsx b/src/client/components/Avatar/Avatar.tsx
new file mode 100644
index 0000000000..f9b2ba35f2
--- /dev/null
+++ b/src/client/components/Avatar/Avatar.tsx
@@ -0,0 +1,23 @@
+import './Avatar.scss'
+import React from 'react'
+
+import { CountryUserSummary, User, Users } from 'meta/user'
+
+type Props = {
+  user: User | CountryUserSummary
+}
+
+const Avatar: React.FC<Props> = (props: Props) => {
+  const { user } = props
+
+  const alt = 'fullName' in user ? user.fullName : Users.getFullName(user)
+  const src = Users.profilePictureUri(user.id)
+
+  return (
+    <div className="user-avatar">
+      <img alt={alt} src={src} />
+    </div>
+  )
+}
+
+export default Avatar
diff --git a/src/client/components/Avatar/index.ts b/src/client/components/Avatar/index.ts
new file mode 100644
index 0000000000..a4600ec776
--- /dev/null
+++ b/src/client/components/Avatar/index.ts
@@ -0,0 +1 @@
+export { default } from './Avatar'
diff --git a/src/client/components/Buttons/Button/Button.scss b/src/client/components/Buttons/Button/Button.scss
index 5b63a05e93..5015dfe67b 100644
--- a/src/client/components/Buttons/Button/Button.scss
+++ b/src/client/components/Buttons/Button/Button.scss
@@ -112,6 +112,10 @@
     }
   }
 
+  &.noBorder {
+    border: unset;
+  }
+
   &.inverse {
     background-color: $colorSecondary;
     color: $colorPrimary;
@@ -153,7 +157,7 @@
 }
 
 .button__type-danger {
-  @include withTheme($ui-destructive, 58%);
+  @include withTheme(darken($ui-destructive, 5%), 58%);
 }
 
 .button__type-primary {
diff --git a/src/client/components/Buttons/Button/hooks/useButtonClassName.ts b/src/client/components/Buttons/Button/hooks/useButtonClassName.ts
index 3aefb5678e..9ccde57a2d 100644
--- a/src/client/components/Buttons/Button/hooks/useButtonClassName.ts
+++ b/src/client/components/Buttons/Button/hooks/useButtonClassName.ts
@@ -5,7 +5,15 @@ import classNames from 'classnames'
 import { ButtonProps, ButtonSize, ButtonType } from 'client/components/Buttons/Button/types'
 
 export const useButtonClassName = (props: ButtonProps): string => {
-  const { className, disabled, inverse, noPrint = true, size = ButtonSize.s, type = ButtonType.primary } = props
+  const {
+    className,
+    disabled,
+    inverse,
+    noBorder = false,
+    noPrint = true,
+    size = ButtonSize.s,
+    type = ButtonType.primary,
+  } = props
 
   return useMemo<string>(() => {
     return classNames(
@@ -15,7 +23,8 @@ export const useButtonClassName = (props: ButtonProps): string => {
       `button__type-${type}`,
       { inverse },
       { disabled },
+      { noBorder },
       className
     )
-  }, [className, disabled, inverse, noPrint, size, type])
+  }, [className, disabled, inverse, noBorder, noPrint, size, type])
 }
diff --git a/src/client/components/Buttons/Button/types.ts b/src/client/components/Buttons/Button/types.ts
index 597921b1d2..0620157708 100644
--- a/src/client/components/Buttons/Button/types.ts
+++ b/src/client/components/Buttons/Button/types.ts
@@ -22,4 +22,5 @@ export type ButtonProps = Pick<InputHTMLAttributes<HTMLButtonElement>, 'classNam
   noPrint?: boolean
   size?: ButtonSize
   type?: ButtonType
+  noBorder?: boolean
 }
diff --git a/src/client/components/Dashboard/Dashboard.scss b/src/client/components/Dashboard/Dashboard.scss
index a0d770788e..6e3cb38386 100644
--- a/src/client/components/Dashboard/Dashboard.scss
+++ b/src/client/components/Dashboard/Dashboard.scss
@@ -1,15 +1,35 @@
 @import 'src/client/style/partials';
 
+$border: 1px dotted $ui-border;
+
 .dashboard {
+  background-color: $ui-bg-light;
+  border-left: $border;
+  border-radius: 2px;
+  border-right: $border;
+  border-top: $border;
   display: grid;
-  grid-column-gap: $spacing-xs;
-  grid-row-gap: $spacing-xs;
   grid-template-columns: 1fr;
   overflow: hidden;
 
   @include min-width($laptop) {
     grid-template-columns: repeat(2, minmax(0, 1fr));
-    padding-top: $spacing-s;
+    margin-top: $spacing-s;
+
+    > .dashboard-item:nth-child(odd) {
+      border-right: $border;
+    }
+  }
+}
+
+@include rtl {
+  .dashboard {
+    @include min-width($laptop) {
+      > .dashboard-item:nth-child(odd) {
+        border-left: $border;
+        border-right: unset;
+      }
+    }
   }
 }
 
@@ -18,23 +38,16 @@
   align-items: start;
   display: grid;
   overflow: hidden;
+  padding: $spacing-xs $spacing-s;
+  border-bottom: $border;
 
   .header {
-    border-radius: 2px;
-    border: 1px solid $ui-border;
-    padding: 6px;
-
     h3 {
-      background-color: $ui-bg;
-      border-radius: 2px;
-      font-size: $font-m;
-      padding: 6px $spacing-xxs;
-      text-transform: uppercase;
+      font-size: $font-m + 1px;
     }
   }
 
   > :nth-child(2) {
-    padding: 0 $spacing-xs;
     overflow: hidden;
   }
 
diff --git a/src/client/components/EditUserForm/CountryRoles/CountryRoles.tsx b/src/client/components/EditUserForm/CountryRoles/CountryRoles.tsx
index 1f4c605aca..9a23a5424f 100644
--- a/src/client/components/EditUserForm/CountryRoles/CountryRoles.tsx
+++ b/src/client/components/EditUserForm/CountryRoles/CountryRoles.tsx
@@ -17,6 +17,10 @@ import CountrySelectModal from 'client/components/CountrySelectModal'
 
 import CountryRole from './CountryRole'
 
+/*
+  This component is used by admins when setting or removing multiple roles
+ */
+
 // properties used to render ui form fields
 const roles = [
   RoleName.REVIEWER,
@@ -33,6 +37,10 @@ type ModalOptionsProps = {
   role: RoleName | null
 }
 
+/**
+ * @deprecated
+ * Deprecation notice: EditUserForm is scheduled for refactor in #3810
+ */
 const CountryRoles: React.FC<{ user: User }> = ({ user }) => {
   const dispatch = useAppDispatch()
   const { t } = useTranslation()
@@ -58,7 +66,7 @@ const CountryRoles: React.FC<{ user: User }> = ({ user }) => {
         (countryIso): Partial<UserRole<RoleName>> => ({
           countryIso: countryIso as CountryIso,
           role,
-          assessmentId: assessment.id,
+          assessmentUuid: assessment.uuid,
           cycleUuid: cycle.uuid,
         })
       )
@@ -70,16 +78,16 @@ const CountryRoles: React.FC<{ user: User }> = ({ user }) => {
           assessmentName: assessment.props.name,
           cycleName: cycle.name,
           roles,
-          userId: user.id,
+          userUuid: user.uuid,
         })
       )
     },
-    [assessment.id, assessment.props.name, cycle.name, cycle.uuid, dispatch, user.id, user.roles]
+    [assessment.props.name, assessment.uuid, cycle.name, cycle.uuid, dispatch, user.roles, user.uuid]
   )
 
   const _toggleAdmin = useCallback(() => {
     if (window.confirm(t(Users.isAdministrator(user) ? 'editUser.demoteToUser' : 'editUser.promoteToAdmin'))) {
-      dispatch(UserManagementActions.updateUserAdminRole({ userId: user.id }))
+      dispatch(UserManagementActions.updateUserAdminRole({ userUuid: user.uuid }))
     }
   }, [dispatch, t, user])
 
@@ -121,9 +129,9 @@ const CountryRoles: React.FC<{ user: User }> = ({ user }) => {
 
         {Users.isAdministrator(userInfo) && (
           <div
+            aria-hidden="true"
             className="edit-user__form-field-role edit-user__form-field-role-admin edit-user__form-field-role-container validation-error-sensitive-field"
             onClick={_toggleAdmin}
-            aria-hidden="true"
           >
             <div className="role">{t(Users.getI18nRoleLabelKey(RoleName.ADMINISTRATOR))}</div>
             <div className={classNames('fra-checkbox', { checked: Users.isAdministrator(user) })} />
@@ -132,15 +140,15 @@ const CountryRoles: React.FC<{ user: User }> = ({ user }) => {
       </div>
 
       <CountrySelectModal
-        open={modalOptions.open}
         countries={countries}
         excludedRegions={excludeRegions}
         headerLabel={t(Users.getI18nRoleLabelKey(modalOptions.role as RoleName))}
-        onClose={() => setModalOptions(initialModalState)}
         initialSelection={modalOptions.initialSelection}
-        unselectableCountries={modalOptions.unselectableCountries}
         onChange={(_, selectionUpdate: Array<string>) => _onChange(selectionUpdate, modalOptions.role)}
+        onClose={() => setModalOptions(initialModalState)}
+        open={modalOptions.open}
         showFooter={false}
+        unselectableCountries={modalOptions.unselectableCountries}
       />
     </div>
   )
diff --git a/src/client/components/EditUserForm/EditUserForm.tsx b/src/client/components/EditUserForm/EditUserForm.tsx
index eca3be6194..530c655be9 100644
--- a/src/client/components/EditUserForm/EditUserForm.tsx
+++ b/src/client/components/EditUserForm/EditUserForm.tsx
@@ -22,14 +22,14 @@ import TextInputField from './TextInputField'
 import UserRolePropsFields from './UserRolePropsFields'
 
 type Props = {
-  targetUser: User
   canEditPermissions?: boolean
   canEditRoles?: boolean
   canEditUser?: boolean
+  targetUser: User
 }
 
 const EditUserForm: React.FC<Props> = (props: Props) => {
-  const { targetUser, canEditPermissions, canEditRoles, canEditUser } = props
+  const { canEditPermissions, canEditRoles, canEditUser, targetUser } = props
   const dispatch = useAppDispatch()
   const assessment = useAssessment()
   const countryIso = useCountryIso()
@@ -81,45 +81,49 @@ const EditUserForm: React.FC<Props> = (props: Props) => {
   const enabled = canEditUser
   const isAdmin = Users.isAdministrator(user)
   const isTargetAdmin = Users.isAdministrator(targetUser)
-  const showRoleSelector = !Areas.isGlobal(countryIso) && isAdmin && !isTargetAdmin
+  const isSelf = user.id === targetUser.id
+  const showRoleSelector =
+    !Areas.isGlobal(countryIso) &&
+    !isSelf &&
+    ((isAdmin && !isTargetAdmin) || Users.getRolesAllowedToEdit({ user, cycle, countryIso }).length > 0)
 
   return (
     <div className="edit-user__form-container">
       <ProfilePicture
+        enabled={enabled}
         onChange={(profilePicture: File) => setProfilePicture(profilePicture)}
         userId={targetUser.id}
-        enabled={enabled}
       />
       <TextInputField
+        enabled={Users.isAdministrator(user)}
+        mandatory
         name="email"
-        value={targetUser.email}
         onChange={changeUser}
         validator={Users.validEmailField}
-        enabled={Users.isAdministrator(user)}
-        mandatory
+        value={targetUser.email}
       />
       <SelectField
+        enabled={enabled}
+        mandatory
         name="title"
-        value={targetUser.props.title}
         onChange={changeUserProp}
         options={appellationOptions}
-        enabled={enabled}
-        mandatory
+        value={targetUser.props.title}
       />
-      <TextInputField name="name" value={targetUser.props.name} onChange={changeUserProp} enabled={enabled} mandatory />
+      <TextInputField enabled={enabled} mandatory name="name" onChange={changeUserProp} value={targetUser.props.name} />
       <TextInputField
-        name="surname"
-        value={targetUser.props.surname}
-        onChange={changeUserProp}
         enabled={enabled}
         mandatory
+        name="surname"
+        onChange={changeUserProp}
+        value={targetUser.props.surname}
       />
-      {showRoleSelector && <UserCountryRoleSelector user={targetUser} enabled={enabled} />}
+      {showRoleSelector && <UserCountryRoleSelector enabled={enabled} target={targetUser} />}
 
       {[RoleName.NATIONAL_CORRESPONDENT, RoleName.ALTERNATE_NATIONAL_CORRESPONDENT, RoleName.COLLABORATOR].includes(
         userRole?.role
       ) &&
-        roleToEdit && <UserRolePropsFields role={roleToEdit} onChange={changeUserRoleProp} enabled={enabled} />}
+        roleToEdit && <UserRolePropsFields enabled={enabled} onChange={changeUserRoleProp} role={roleToEdit} />}
       <div className="edit-user__form-item">
         <div className="edit-user__form-label">{t('editUser.mandatoryFields')}</div>
       </div>
@@ -128,7 +132,7 @@ const EditUserForm: React.FC<Props> = (props: Props) => {
       )}
       {canEditRoles && <CountryRoles user={targetUser} />}
 
-      {isAdmin && <DisableUser user={targetUser} changeUser={changeUser} />}
+      {isAdmin && <DisableUser changeUser={changeUser} user={targetUser} />}
     </div>
   )
 }
diff --git a/src/client/components/EditUserForm/TextInputField/TextInputField.tsx b/src/client/components/EditUserForm/TextInputField/TextInputField.tsx
index 6fb8acce0f..c67f189aea 100644
--- a/src/client/components/EditUserForm/TextInputField/TextInputField.tsx
+++ b/src/client/components/EditUserForm/TextInputField/TextInputField.tsx
@@ -43,7 +43,9 @@ const TextInputField: React.FC<Props> = (props) => {
           error: !valid,
         })}
       >
-        {editorLink && <EditorWYSIWYGLinks onChange={(_value) => onChange(name, _value)} value={value} />}
+        {editorLink && (
+          <EditorWYSIWYGLinks disabled={!enabled} onChange={(_value) => onChange(name, _value)} value={value} />
+        )}
 
         {!editorLink && (
           <input
diff --git a/src/client/components/EditUserForm/UserCountryRoleSelector/UserCountryRoleSelector.tsx b/src/client/components/EditUserForm/UserCountryRoleSelector/UserCountryRoleSelector.tsx
index 2f04eabd8e..274f8ecb76 100644
--- a/src/client/components/EditUserForm/UserCountryRoleSelector/UserCountryRoleSelector.tsx
+++ b/src/client/components/EditUserForm/UserCountryRoleSelector/UserCountryRoleSelector.tsx
@@ -5,25 +5,26 @@ import { User, Users } from 'meta/user'
 import { useCycle } from 'client/store/assessment'
 import { useCountryRouteParams } from 'client/hooks/useRouteParams'
 import SelectField from 'client/components/EditUserForm/SelectField'
-import { useOnChange } from 'client/components/EditUserForm/UserCountryRoleSelector/hooks/useOnChange'
-import { useOptions } from 'client/components/EditUserForm/UserCountryRoleSelector/hooks/useOptions'
+
+import { useOnChange } from './hooks/useOnChange'
+import { useOptions } from './hooks/useOptions'
 
 type Props = {
   enabled: boolean
-  user: User
+  target: User
 }
 
 const UserCountryRoleSelector: React.FC<Props> = (props: Props) => {
-  const { enabled, user } = props
+  const { enabled, target } = props
   const { countryIso } = useCountryRouteParams()
   const cycle = useCycle()
 
-  const userRole = Users.getRole(user, countryIso, cycle)
+  const userRole = Users.getRole(target, countryIso, cycle)
 
   const options = useOptions()
-  const onChange = useOnChange(user)
+  const onChange = useOnChange(target)
 
-  return <SelectField onChange={onChange} name="role" options={options} value={userRole.role} enabled={enabled} />
+  return <SelectField enabled={enabled} name="role" onChange={onChange} options={options} value={userRole.role} />
 }
 
 export default UserCountryRoleSelector
diff --git a/src/client/components/EditUserForm/UserCountryRoleSelector/hooks/useOnChange.ts b/src/client/components/EditUserForm/UserCountryRoleSelector/hooks/useOnChange.ts
index d9388e5880..301419ab82 100644
--- a/src/client/components/EditUserForm/UserCountryRoleSelector/hooks/useOnChange.ts
+++ b/src/client/components/EditUserForm/UserCountryRoleSelector/hooks/useOnChange.ts
@@ -25,7 +25,7 @@ export const useOnChange = (user: User): Returned => {
         return userRole
       })
 
-      const params = { assessmentName, cycleName, roles, userId: user.id }
+      const params = { assessmentName, cycleName, roles, userUuid: user.uuid }
       dispatch(UserManagementActions.updateUserRoles(params))
     },
     [assessmentName, countryIso, cycle, cycleName, dispatch, user]
diff --git a/src/client/components/EditUserForm/UserCountryRoleSelector/hooks/useOptions.tsx b/src/client/components/EditUserForm/UserCountryRoleSelector/hooks/useOptions.tsx
index c80045a824..e10e329e07 100644
--- a/src/client/components/EditUserForm/UserCountryRoleSelector/hooks/useOptions.tsx
+++ b/src/client/components/EditUserForm/UserCountryRoleSelector/hooks/useOptions.tsx
@@ -1,26 +1,26 @@
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { RoleName, Users } from 'meta/user'
+import { Users } from 'meta/user'
 
+import { useCycle } from 'client/store/assessment'
+import { useUser } from 'client/store/user'
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
 import { Option } from 'client/components/Inputs/Select'
 
 type Returned = Array<Option>
 
 export const useOptions = (): Returned => {
   const { t } = useTranslation()
+  const { countryIso } = useCountryRouteParams()
+  const cycle = useCycle()
+  const user = useUser()
 
   return useMemo<Returned>(() => {
-    const options = Object.keys(RoleName).reduce<Returned>((acc, key) => {
-      if (key !== RoleName.ADMINISTRATOR) {
-        acc.push({
-          label: t(Users.getI18nRoleLabelKey(key)),
-          value: key,
-        })
-      }
-      return acc
-    }, [])
+    const roleNames = Users.getRolesAllowedToEdit({ user, countryIso, cycle })
 
-    return options
-  }, [t])
+    return roleNames.map<Option>((roleName) => {
+      return { label: t(Users.getI18nRoleLabelKey(roleName)), value: roleName }
+    }, [])
+  }, [countryIso, cycle, t, user])
 }
diff --git a/src/client/components/Hr/Hr.tsx b/src/client/components/Hr/Hr.tsx
index c99c236612..bf6098890e 100644
--- a/src/client/components/Hr/Hr.tsx
+++ b/src/client/components/Hr/Hr.tsx
@@ -1,8 +1,19 @@
 import './Hr.scss'
 import React from 'react'
 
-const Hr: React.FC = () => {
-  return <div className="hr" />
+import classNames from 'classnames'
+
+type Props = {
+  className?: string
+}
+
+const Hr: React.FC<Props> = (props: Props) => {
+  const { className } = props
+  return <div className={classNames('hr', className)} />
+}
+
+Hr.defaultProps = {
+  className: undefined,
 }
 
 export default Hr
diff --git a/src/client/components/MessageCenter/Topic/Message/Message.scss b/src/client/components/MessageCenter/Topic/Message/Message.scss
index 51abec0d7d..553b90fe6a 100644
--- a/src/client/components/MessageCenter/Topic/Message/Message.scss
+++ b/src/client/components/MessageCenter/Topic/Message/Message.scss
@@ -69,6 +69,8 @@
 
   .message-author {
     color: $text-disabled;
+    font-style: italic;
+    text-decoration: line-through;
   }
 
   .message-time {
diff --git a/src/client/components/PageLayout/Toolbar/Status/StatusConfirm.scss b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/StatusConfirm.scss
similarity index 100%
rename from src/client/components/PageLayout/Toolbar/Status/StatusConfirm.scss
rename to src/client/components/PageLayout/Toolbar/Status/StatusConfirm/StatusConfirm.scss
diff --git a/src/client/components/PageLayout/Toolbar/Status/StatusConfirm.tsx b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/StatusConfirm.tsx
similarity index 95%
rename from src/client/components/PageLayout/Toolbar/Status/StatusConfirm.tsx
rename to src/client/components/PageLayout/Toolbar/Status/StatusConfirm/StatusConfirm.tsx
index 64ceb91e2e..f190363b79 100644
--- a/src/client/components/PageLayout/Toolbar/Status/StatusConfirm.tsx
+++ b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/StatusConfirm.tsx
@@ -14,10 +14,10 @@ import { AreaActions, useAssessmentCountry } from 'client/store/area'
 import { useUser } from 'client/store/user'
 import { useCountryIso } from 'client/hooks'
 import { Modal, ModalBody, ModalClose, ModalFooter, ModalHeader } from 'client/components/Modal'
-import UserList from 'client/components/UserList'
 
+import { StatusTransition } from '../types'
 import { useRecipients } from './hooks/useRecipients'
-import { StatusTransition } from './types'
+import UserList from './UserList'
 
 type Props = {
   onClose: () => void
@@ -53,9 +53,9 @@ const StatusConfirm: React.FC<Props> = (props) => {
         <div style={{ height: '160px' }}>
           <textarea
             className="nav-assessment-status-confirm__message"
+            onChange={({ target: { value } }) => setTextareaValue(value)}
             placeholder={i18n.t('navigation.changeStatusTextPlaceholder')}
             value={textareaValue}
-            onChange={({ target: { value } }) => setTextareaValue(value)}
           />
         </div>
 
@@ -71,7 +71,7 @@ const StatusConfirm: React.FC<Props> = (props) => {
             {i18n.t('navigation.doNotNotifyUsers')}
           </div>
         )}
-        {notifyUsers && hasRecipients && <UserList readOnly users={recipients} />}
+        {notifyUsers && hasRecipients && <UserList users={recipients} />}
         <div
           className="nav-assessment-status-confirm__notify-self"
           onClick={() => setNotifySelf(!notifySelf)}
diff --git a/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/UserList/UserList.scss b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/UserList/UserList.scss
new file mode 100644
index 0000000000..21c438bae8
--- /dev/null
+++ b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/UserList/UserList.scss
@@ -0,0 +1,15 @@
+@import 'src/client/style/partials';
+
+.status-confirm__user-list {
+  .data-cell,
+  .data-cell.header {
+    padding: $spacing-xs;
+    border-left: unset;
+    line-height: 19px;
+  }
+
+  // Don't show border top for header row
+  & > .data-cell.header {
+    border-top: unset;
+  }
+}
diff --git a/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/UserList/UserList.tsx b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/UserList/UserList.tsx
new file mode 100644
index 0000000000..a2d2e6d902
--- /dev/null
+++ b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/UserList/UserList.tsx
@@ -0,0 +1,68 @@
+import './UserList.scss'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { CountryUserSummary, Users } from 'meta/user'
+
+import { useCycle } from 'client/store/assessment'
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import { DataCell, DataGrid } from 'client/components/DataGrid'
+
+interface Props {
+  users: Array<CountryUserSummary>
+}
+
+interface CellProps {
+  countryUserSummary: CountryUserSummary
+}
+
+const NameCell: React.FC<CellProps> = ({ countryUserSummary }) => <span>{countryUserSummary.fullName}</span>
+
+const RoleCell: React.FC<CellProps> = ({ countryUserSummary }) => {
+  const { t } = useTranslation()
+  const { countryIso } = useCountryRouteParams()
+  const cycle = useCycle()
+  const role = Users.getRole(countryUserSummary, countryIso, cycle)
+  const key = Users.getI18nRoleLabelKey(role.role)
+  return <span>{t(key)}</span>
+}
+
+const EmailCell: React.FC<CellProps> = ({ countryUserSummary }) => <span>{countryUserSummary.email}</span>
+
+const Components: Record<string, React.FC<CellProps>> = {
+  name: NameCell,
+  role: RoleCell,
+  email: EmailCell,
+}
+
+const UserList: React.FC<Props> = (props: Props) => {
+  const { users } = props
+
+  const { t } = useTranslation()
+  const headers = Object.keys(Components)
+  const gridTemplateColumns = `repeat(${headers.length}, 1fr)`
+
+  return (
+    <DataGrid className="status-confirm__user-list" gridTemplateColumns={gridTemplateColumns}>
+      {headers.map((header) => {
+        return (
+          <DataCell key={header} header>
+            {t(`common.${header}`)}
+          </DataCell>
+        )
+      })}
+      {users.map((countryUserSummary, j) => {
+        const lastRow = users.length - 1 === j
+        return headers.map((header) => {
+          return (
+            <DataCell key={`${countryUserSummary.email}-${header}`} lastRow={lastRow}>
+              {React.createElement(Components[header], { countryUserSummary })}
+            </DataCell>
+          )
+        })
+      })}
+    </DataGrid>
+  )
+}
+
+export default UserList
diff --git a/src/client/components/UserList/index.ts b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/UserList/index.ts
similarity index 100%
rename from src/client/components/UserList/index.ts
rename to src/client/components/PageLayout/Toolbar/Status/StatusConfirm/UserList/index.ts
diff --git a/src/client/components/PageLayout/Toolbar/Status/hooks/useRecipients.ts b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/hooks/useRecipients.ts
similarity index 100%
rename from src/client/components/PageLayout/Toolbar/Status/hooks/useRecipients.ts
rename to src/client/components/PageLayout/Toolbar/Status/StatusConfirm/hooks/useRecipients.ts
diff --git a/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/index.ts b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/index.ts
new file mode 100644
index 0000000000..0b0c389f20
--- /dev/null
+++ b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm/index.ts
@@ -0,0 +1 @@
+export { default } from './StatusConfirm'
diff --git a/src/client/components/TablePaginated/Body/Body.scss b/src/client/components/TablePaginated/Body/Body.scss
new file mode 100644
index 0000000000..421da90a6b
--- /dev/null
+++ b/src/client/components/TablePaginated/Body/Body.scss
@@ -0,0 +1,6 @@
+@import 'src/client/style/partials';
+
+.table-paginated__groups {
+  display: grid;
+  grid-row-gap: $spacing-xs;
+}
diff --git a/src/client/components/TablePaginated/Body/Body.tsx b/src/client/components/TablePaginated/Body/Body.tsx
index bbbe53697f..5b2ede00fa 100644
--- a/src/client/components/TablePaginated/Body/Body.tsx
+++ b/src/client/components/TablePaginated/Body/Body.tsx
@@ -1,62 +1,42 @@
+import './Body.scss'
 import React from 'react'
-import { SkeletonTheme } from 'react-loading-skeleton'
 
-import classNames from 'classnames'
+import { Objects } from 'utils/objects'
 
-import { useTablePaginatedData } from 'client/store/ui/tablePaginated'
-import DataColumn from 'client/components/DataGridDeprecated/DataColumn'
-import { Props as BaseProps, TablePaginatedSkeleton } from 'client/components/TablePaginated/types'
+import Rows from 'client/components/TablePaginated/Body/Rows'
+import RowsGroup from 'client/components/TablePaginated/Body/RowsGroup'
+import RowsSkeleton from 'client/components/TablePaginated/Body/RowsSkeleton'
+import { Props as BaseProps } from 'client/components/TablePaginated/types'
 
-type Props<Datum extends object> = BaseProps<Datum> & {
-  limit: number
-  wrapCells: boolean
-  skeleton: TablePaginatedSkeleton
-}
+import { useTablePaginatedBodyData } from './hooks/useTablePaginatedBodyData'
 
-const Body = <Datum extends object>(props: Props<Datum>) => {
-  const { columns, limit, path, wrapCells, skeleton } = props
+const Body = <Datum extends object>(props: BaseProps<Datum>) => {
+  const { columns, groups, limit, wrapCells, skeleton } = props
 
-  const data = useTablePaginatedData<Datum>(path)
+  const data = useTablePaginatedBodyData<Datum>(props)
 
-  if (!data) {
-    const { baseColor, highlightColor, Component } = skeleton
+  if (Objects.isNil(data)) {
+    return <RowsSkeleton columns={columns} limit={limit} skeleton={skeleton} />
+  }
 
+  if (!Objects.isNil(groups)) {
     return (
-      <SkeletonTheme baseColor={baseColor} highlightColor={highlightColor} inline>
-        {Array.from(Array(limit).keys()).map((i) => {
-          return (
-            <React.Fragment key={`row-skeleton-${String(i)}`}>
-              {columns.map((column) => (
-                <Component key={column.key} />
-              ))}
-            </React.Fragment>
-          )
-        })}
-      </SkeletonTheme>
+      <div className="table-paginated__groups">
+        {(data as Array<[PropertyKey, Array<Datum>]>).map(([propertyKey, dataRows]) => (
+          <RowsGroup
+            key={propertyKey.toString()}
+            columns={columns}
+            data={dataRows}
+            groups={groups}
+            propertyKey={propertyKey}
+            wrapCells={wrapCells}
+          />
+        ))}
+      </div>
     )
   }
 
-  return (
-    <>
-      {data.map((datum, rowIndex) => (
-        <React.Fragment key={`row_${String(rowIndex)}}`}>
-          {columns.map((column) => {
-            const { component: Component, key } = column
-
-            if (wrapCells) {
-              return (
-                <DataColumn key={key} className={classNames({ withBorder: rowIndex !== 0 })}>
-                  <Component datum={datum} rowIndex={rowIndex} />
-                </DataColumn>
-              )
-            }
-
-            return <Component key={key} datum={datum} rowIndex={rowIndex} />
-          })}
-        </React.Fragment>
-      ))}
-    </>
-  )
+  return <Rows columns={columns} data={data as Array<Datum>} wrapCells={wrapCells} />
 }
 
 export default Body
diff --git a/src/client/components/TablePaginated/Body/Rows/Rows.tsx b/src/client/components/TablePaginated/Body/Rows/Rows.tsx
new file mode 100644
index 0000000000..d109b9c7eb
--- /dev/null
+++ b/src/client/components/TablePaginated/Body/Rows/Rows.tsx
@@ -0,0 +1,34 @@
+import React from 'react'
+
+import classNames from 'classnames'
+
+import DataColumn from 'client/components/DataGridDeprecated/DataColumn'
+import { Props as BaseProps } from 'client/components/TablePaginated/types'
+
+type Props<Datum extends object> = Pick<BaseProps<Datum>, 'columns' | 'wrapCells'> & {
+  data: Array<Datum>
+}
+
+const Rows = <Datum extends object>(props: Props<Datum>) => {
+  const { columns, data, wrapCells } = props
+
+  return data.map((datum, rowIndex) => (
+    <React.Fragment key={`row_${String(rowIndex)}}`}>
+      {columns.map((column) => {
+        const { component: Component, key } = column
+
+        if (wrapCells) {
+          return (
+            <DataColumn key={key} className={classNames({ withBorder: rowIndex !== 0 })}>
+              <Component datum={datum} rowIndex={rowIndex} />
+            </DataColumn>
+          )
+        }
+
+        return <Component key={key} datum={datum} rowIndex={rowIndex} />
+      })}
+    </React.Fragment>
+  ))
+}
+
+export default Rows
diff --git a/src/client/components/TablePaginated/Body/Rows/index.ts b/src/client/components/TablePaginated/Body/Rows/index.ts
new file mode 100644
index 0000000000..a0cf7ded52
--- /dev/null
+++ b/src/client/components/TablePaginated/Body/Rows/index.ts
@@ -0,0 +1 @@
+export { default } from './Rows'
diff --git a/src/client/components/TablePaginated/Body/RowsGroup/RowsGroup.scss b/src/client/components/TablePaginated/Body/RowsGroup/RowsGroup.scss
new file mode 100644
index 0000000000..5424b4f7cb
--- /dev/null
+++ b/src/client/components/TablePaginated/Body/RowsGroup/RowsGroup.scss
@@ -0,0 +1,31 @@
+@import 'src/client/style/partials';
+
+button.rows-group__header.inverse {
+  background-color: $ui-bg-light;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom: 1px solid transparent;
+  border-left: 1px solid $ui-border;
+  border-right: 1px solid $ui-border;
+  border-top: 1px solid $ui-border;
+
+  &.collapsed {
+    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: 2px;
+    border-bottom: 1px solid $ui-border;
+
+    svg {
+      transform: rotate(-90deg);
+    }
+  }
+}
+
+.rows-group__rows {
+  background-color: $ui-bg-light;
+  border-bottom-left-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-top-right-radius: 2px;
+  border: 1px solid $ui-border;
+  margin-top: -1px;
+  padding: $spacing-xxs;
+}
diff --git a/src/client/components/TablePaginated/Body/RowsGroup/RowsGroup.tsx b/src/client/components/TablePaginated/Body/RowsGroup/RowsGroup.tsx
new file mode 100644
index 0000000000..4cd5e13b80
--- /dev/null
+++ b/src/client/components/TablePaginated/Body/RowsGroup/RowsGroup.tsx
@@ -0,0 +1,41 @@
+import './RowsGroup.scss'
+import React, { useCallback, useState } from 'react'
+
+import classNames from 'classnames'
+
+import Button, { ButtonSize, ButtonType } from 'client/components/Buttons/Button'
+import Rows from 'client/components/TablePaginated/Body/Rows'
+import { Props as BaseProps } from 'client/components/TablePaginated/types'
+
+type Props<Datum extends object> = Pick<BaseProps<Datum>, 'columns' | 'groups' | 'wrapCells'> & {
+  data: Array<Datum>
+  propertyKey: PropertyKey
+}
+
+const RowsGroup = <Datum extends object>(props: Props<Datum>) => {
+  const { columns, data, groups, propertyKey, wrapCells } = props
+
+  const [collapsed, setCollapsed] = useState<boolean>(false)
+  const toggleView = useCallback(() => setCollapsed((prevState) => !prevState), [])
+
+  return (
+    <div>
+      <Button
+        className={classNames('rows-group__header', { collapsed })}
+        iconName="small-down"
+        inverse
+        label={`${groups.headerLabel(propertyKey)} (${data.length})`}
+        onClick={toggleView}
+        size={ButtonSize.m}
+        type={ButtonType.black}
+      />
+      {!collapsed && (
+        <div className="rows-group__rows">
+          <Rows columns={columns} data={data} wrapCells={wrapCells} />
+        </div>
+      )}
+    </div>
+  )
+}
+
+export default RowsGroup
diff --git a/src/client/components/TablePaginated/Body/RowsGroup/index.ts b/src/client/components/TablePaginated/Body/RowsGroup/index.ts
new file mode 100644
index 0000000000..ce68fa6b78
--- /dev/null
+++ b/src/client/components/TablePaginated/Body/RowsGroup/index.ts
@@ -0,0 +1 @@
+export { default } from './RowsGroup'
diff --git a/src/client/components/TablePaginated/Body/RowsSkeleton/RowsSkeleton.tsx b/src/client/components/TablePaginated/Body/RowsSkeleton/RowsSkeleton.tsx
new file mode 100644
index 0000000000..ec8044d78e
--- /dev/null
+++ b/src/client/components/TablePaginated/Body/RowsSkeleton/RowsSkeleton.tsx
@@ -0,0 +1,31 @@
+import React from 'react'
+import { SkeletonTheme } from 'react-loading-skeleton'
+
+import { Column, TablePaginatedSkeleton } from 'client/components/TablePaginated/types'
+
+type Props = {
+  columns: Array<Column<unknown>>
+  limit: number
+  skeleton: TablePaginatedSkeleton
+}
+
+const RowsSkeleton: React.FC<Props> = (props) => {
+  const { columns, limit, skeleton } = props
+  const { baseColor, highlightColor, Component } = skeleton
+
+  return (
+    <SkeletonTheme baseColor={baseColor} highlightColor={highlightColor} inline>
+      {Array.from(Array(limit).keys()).map((i) => {
+        return (
+          <React.Fragment key={`row-skeleton-${String(i)}`}>
+            {columns.map((column) => (
+              <Component key={column.key} />
+            ))}
+          </React.Fragment>
+        )
+      })}
+    </SkeletonTheme>
+  )
+}
+
+export default RowsSkeleton
diff --git a/src/client/components/TablePaginated/Body/RowsSkeleton/index.ts b/src/client/components/TablePaginated/Body/RowsSkeleton/index.ts
new file mode 100644
index 0000000000..6a553bb6ee
--- /dev/null
+++ b/src/client/components/TablePaginated/Body/RowsSkeleton/index.ts
@@ -0,0 +1 @@
+export { default } from './RowsSkeleton'
diff --git a/src/client/components/TablePaginated/Body/hooks/useTablePaginatedBodyData.ts b/src/client/components/TablePaginated/Body/hooks/useTablePaginatedBodyData.ts
new file mode 100644
index 0000000000..643f846c28
--- /dev/null
+++ b/src/client/components/TablePaginated/Body/hooks/useTablePaginatedBodyData.ts
@@ -0,0 +1,18 @@
+import { Objects } from 'utils/objects'
+
+import { useTablePaginatedData } from 'client/store/ui/tablePaginated'
+import { Props as BaseProps } from 'client/components/TablePaginated/types'
+
+type Returned<Datum extends object> = Array<Datum> | Array<[PropertyKey, Array<Datum>]> | undefined
+
+export const useTablePaginatedBodyData = <Datum extends object>(props: BaseProps<Datum>): Returned<Datum> => {
+  const { compareFn, groups, path } = props
+
+  const data = useTablePaginatedData<Datum>(path, compareFn)
+
+  if (Objects.isNil(data) || Objects.isNil(groups)) {
+    return data
+  }
+
+  return Object.entries(Object.groupBy(data ?? [], groups.keySelector))
+}
diff --git a/src/client/components/TablePaginated/ExportButton/hooks/useExportUrl.tsx b/src/client/components/TablePaginated/ExportButton/hooks/useExportUrl.tsx
index 4646941559..aeb50f39f9 100644
--- a/src/client/components/TablePaginated/ExportButton/hooks/useExportUrl.tsx
+++ b/src/client/components/TablePaginated/ExportButton/hooks/useExportUrl.tsx
@@ -1,5 +1,7 @@
 import { useMemo } from 'react'
 
+import { Objects } from 'utils/objects'
+
 import { TablePaginateds } from 'meta/tablePaginated'
 
 import { useTablePaginatedOrderBy } from 'client/store/ui/tablePaginated'
@@ -28,7 +30,7 @@ export const useExportUrl = (props: Props): string => {
         orderBy: orderBy?.property,
         orderByDirection: orderBy?.direction,
         sectionName,
-      }).filter(([, value]) => value !== undefined)
+      }).filter(([, value]) => !Objects.isNil(value))
     )
     return `${path}/export?${queryParams.toString()}`
   }, [assessmentName, countryIso, cycleName, filters, orderBy, path, sectionName])
diff --git a/src/client/components/TablePaginated/Filters/Filters.tsx b/src/client/components/TablePaginated/Filters/Filters.tsx
index bd1517cb9e..633b09a26b 100644
--- a/src/client/components/TablePaginated/Filters/Filters.tsx
+++ b/src/client/components/TablePaginated/Filters/Filters.tsx
@@ -6,6 +6,7 @@ import { TablePaginatedFilterType } from 'meta/tablePaginated'
 import Icon from 'client/components/Icon'
 import Country from 'client/components/TablePaginated/Filters/Country/Country'
 import MultiSelect from 'client/components/TablePaginated/Filters/MultiSelect/MultiSelect'
+import Switch from 'client/components/TablePaginated/Filters/Switch'
 import Text from 'client/components/TablePaginated/Filters/Text/Text'
 import { TablePaginatedFilter } from 'client/components/TablePaginated/types'
 
@@ -15,7 +16,7 @@ const componentsByFilterType: Record<
 > = {
   [TablePaginatedFilterType.COUNTRY]: Country,
   [TablePaginatedFilterType.MULTI_SELECT]: MultiSelect,
-  [TablePaginatedFilterType.SWITCH]: () => null,
+  [TablePaginatedFilterType.SWITCH]: Switch,
   [TablePaginatedFilterType.TEXT]: Text,
 }
 
diff --git a/src/client/components/TablePaginated/Filters/Switch/Switch.tsx b/src/client/components/TablePaginated/Filters/Switch/Switch.tsx
new file mode 100644
index 0000000000..840074936d
--- /dev/null
+++ b/src/client/components/TablePaginated/Filters/Switch/Switch.tsx
@@ -0,0 +1,36 @@
+import React from 'react'
+
+import classNames from 'classnames'
+import { Objects } from 'utils/objects'
+
+import { TablePaginatedFilterType } from 'meta/tablePaginated'
+
+import { useAppDispatch } from 'client/store'
+import { TablePaginatedActions } from 'client/store/ui/tablePaginated'
+import { useTablePaginatedFilterValue } from 'client/store/ui/tablePaginated/hooks'
+import ButtonCheckbox from 'client/components/Buttons/ButtonCheckbox'
+import { TablePaginatedFilter } from 'client/components/TablePaginated/types'
+
+type Props = TablePaginatedFilter<TablePaginatedFilterType.SWITCH> & {
+  path: string
+}
+
+const Switch = (props: Props) => {
+  const { fieldName, label, path } = props
+  const dispatch = useAppDispatch()
+
+  const filterValue = useTablePaginatedFilterValue<boolean>(path, fieldName)
+
+  const handleChange = () => {
+    const value = !filterValue
+    dispatch(TablePaginatedActions.setFilterValue({ fieldName, path, value }))
+  }
+
+  return (
+    <div className={classNames('table-paginated-filter-input', { active: !Objects.isEmpty(filterValue) })}>
+      <ButtonCheckbox checked={filterValue ?? false} label={label} onClick={handleChange} />
+    </div>
+  )
+}
+
+export default Switch
diff --git a/src/client/components/TablePaginated/Filters/Switch/index.ts b/src/client/components/TablePaginated/Filters/Switch/index.ts
new file mode 100644
index 0000000000..5723ab7715
--- /dev/null
+++ b/src/client/components/TablePaginated/Filters/Switch/index.ts
@@ -0,0 +1 @@
+export { default } from './Switch'
diff --git a/src/client/components/TablePaginated/Filters/Text/Text.scss b/src/client/components/TablePaginated/Filters/Text/Text.scss
index 0cbf47a894..5b97db447a 100644
--- a/src/client/components/TablePaginated/Filters/Text/Text.scss
+++ b/src/client/components/TablePaginated/Filters/Text/Text.scss
@@ -1,7 +1,8 @@
 @import 'src/client/style/partials';
 
 .table-paginated-filter-input {
-  display: inline-block;
+  align-items: center;
+  display: flex;
   height: 100%;
   position: relative;
 
diff --git a/src/client/components/TablePaginated/TablePaginated.tsx b/src/client/components/TablePaginated/TablePaginated.tsx
index a3af724773..c82c997267 100644
--- a/src/client/components/TablePaginated/TablePaginated.tsx
+++ b/src/client/components/TablePaginated/TablePaginated.tsx
@@ -3,10 +3,8 @@ import React, { HTMLAttributes, useMemo, useRef } from 'react'
 import Skeleton from 'react-loading-skeleton'
 
 import classNames from 'classnames'
-import { Objects } from 'utils/objects'
 
-import { useTablePaginatedCount, useTablePaginatedData, useTablePaginatedPage } from 'client/store/ui/tablePaginated'
-import { useOnUpdate } from 'client/hooks'
+import { useTablePaginatedCount } from 'client/store/ui/tablePaginated'
 import DataGrid from 'client/components/DataGridDeprecated'
 import { PaginatorProps } from 'client/components/Paginator'
 import Filters from 'client/components/TablePaginated/Filters/Filters'
@@ -15,12 +13,13 @@ import ExportButton from './ExportButton/ExportButton'
 import { useFetchData } from './hooks/useFetchData'
 import { useInitTablePaginated } from './hooks/useInitTablePaginated'
 import { useResetOnUnmount } from './hooks/useResetOnUnmount'
+import { useScrollToTopOnPageUpdate } from './hooks/useScrollToTopOnPageUpdate'
 import Body from './Body'
 import Count from './Count'
 import DefaultEmptyList from './DefaultEmptyList'
 import Header from './Header'
 import Paginator from './Paginator'
-import { Props as BaseProps, TablePaginatedCounter, TablePaginatedSkeleton } from './types'
+import { Props as BaseProps, TablePaginatedCounter } from './types'
 
 type Props<Datum extends object> = Pick<HTMLAttributes<HTMLDivElement>, 'className'> &
   Pick<HTMLAttributes<HTMLDivElement>['style'], 'gridTemplateColumns'> &
@@ -30,36 +29,27 @@ type Props<Datum extends object> = Pick<HTMLAttributes<HTMLDivElement>, 'classNa
     EmptyListComponent?: React.FC
     export?: boolean
     header?: boolean
-    skeleton?: TablePaginatedSkeleton
-    wrapCells?: boolean
   }
 
 const TablePaginated = <Datum extends object>(props: Props<Datum>) => {
-  const { className, gridTemplateColumns } = props // HTMLDivElement Props
+  const { className, gridTemplateColumns: gridTemplateColumnsProps } = props // HTMLDivElement Props
   const { marginPagesDisplayed, pageRangeDisplayed } = props // Paginator Props
-  const { columns, filters, limit, path } = props // Base Props
-  const { counter, EmptyListComponent, export: exportTable, header, skeleton, wrapCells } = props // Component Props
+  const { columns, filters, groups, limit, path } = props // Base Props
+  const { counter, EmptyListComponent, export: exportTable, header, skeleton, wrapCells, compareFn } = props // Component Props
+
+  const divRef = useRef<HTMLDivElement>()
 
   useInitTablePaginated({ filters, path })
   useFetchData({ counter, limit, path })
   useResetOnUnmount({ path })
-
+  useScrollToTopOnPageUpdate({ divRef, path })
   const count = useTablePaginatedCount(path)
-  const data = useTablePaginatedData(path)
-  const page = useTablePaginatedPage(path)
 
+  const gridTemplateColumns = useMemo<string | number>(
+    () => gridTemplateColumnsProps ?? `repeat(${columns.length}, auto)`,
+    [columns.length, gridTemplateColumnsProps]
+  )
   const withFilters = useMemo<boolean>(() => filters.filter((filter) => !filter.hidden).length > 0, [filters])
-  const divRef = useRef<HTMLDivElement>()
-
-  // on page update -> scroll on top
-  useOnUpdate(() => {
-    if (!Objects.isNil(data)) {
-      setTimeout(() => {
-        const opts: ScrollIntoViewOptions = { behavior: 'smooth', block: 'start', inline: 'nearest' }
-        divRef.current?.parentElement?.parentElement?.scrollIntoView(opts)
-      })
-    }
-  }, [page])
 
   return (
     <div ref={divRef} className={classNames('table-paginated', className)}>
@@ -71,13 +61,18 @@ const TablePaginated = <Datum extends object>(props: Props<Datum>) => {
             {withFilters && <Filters filters={filters} path={path} />}
           </div>
         )}
-        <DataGrid
-          className="table-paginated-datagrid"
-          style={{ gridTemplateColumns: gridTemplateColumns ?? `repeat(${columns.length}, auto)` }}
-        >
+        <DataGrid className="table-paginated-datagrid" style={{ gridTemplateColumns }}>
           {header && <Header columns={columns} path={path} />}
           {count?.total === 0 && <EmptyListComponent />}
-          <Body columns={columns} limit={limit} path={path} skeleton={skeleton} wrapCells={wrapCells} />
+          <Body
+            columns={columns}
+            compareFn={compareFn}
+            groups={groups}
+            limit={limit}
+            path={path}
+            skeleton={skeleton}
+            wrapCells={wrapCells}
+          />
         </DataGrid>
       </div>
 
@@ -102,11 +97,13 @@ TablePaginated.defaultProps = {
   header: true,
   // eslint-disable-next-line react/default-props-match-prop-types
   limit: 30,
+  // eslint-disable-next-line react/default-props-match-prop-types
   skeleton: {
     baseColor: 'white',
     highlightColor: 'var(--ui-bg)',
-    Component: () => <Skeleton borderRadius="2px" height="20px" width="100%" />,
+    Component: () => <Skeleton borderRadius="2px" duration={1} height="20px" width="100%" />,
   },
+  // eslint-disable-next-line react/default-props-match-prop-types
   wrapCells: true,
 }
 
diff --git a/src/client/components/TablePaginated/hooks/useScrollToTopOnPageUpdate.ts b/src/client/components/TablePaginated/hooks/useScrollToTopOnPageUpdate.ts
new file mode 100644
index 0000000000..42fe19779f
--- /dev/null
+++ b/src/client/components/TablePaginated/hooks/useScrollToTopOnPageUpdate.ts
@@ -0,0 +1,27 @@
+import { MutableRefObject } from 'react'
+
+import { Objects } from 'utils/objects'
+
+import { useTablePaginatedData, useTablePaginatedPage } from 'client/store/ui/tablePaginated'
+import { useOnUpdate } from 'client/hooks'
+
+type Props = {
+  divRef: MutableRefObject<HTMLDivElement>
+  path: string
+}
+
+export const useScrollToTopOnPageUpdate = (props: Props): void => {
+  const { divRef, path } = props
+
+  const data = useTablePaginatedData(path)
+  const page = useTablePaginatedPage(path)
+
+  useOnUpdate(() => {
+    if (!Objects.isNil(data)) {
+      setTimeout(() => {
+        const opts: ScrollIntoViewOptions = { behavior: 'smooth', block: 'start', inline: 'nearest' }
+        divRef.current?.parentElement?.parentElement?.scrollIntoView(opts)
+      })
+    }
+  }, [page])
+}
diff --git a/src/client/components/TablePaginated/types.ts b/src/client/components/TablePaginated/types.ts
index 3d60df93b0..e4bacf855f 100644
--- a/src/client/components/TablePaginated/types.ts
+++ b/src/client/components/TablePaginated/types.ts
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { TablePaginatedCount, TablePaginatedFilterType } from 'meta/tablePaginated'
+import { TablePaginatedCompareFn, TablePaginatedCount, TablePaginatedFilterType } from 'meta/tablePaginated'
 
 export type ColumnComponentProps<Datum> = {
   datum: Datum
@@ -14,11 +14,15 @@ export type Column<Datum> = {
   orderByProperty?: string
 }
 
-export type Props<Datum> = {
+export type Props<Datum extends object> = {
   columns: Array<Column<Datum>>
+  compareFn?: TablePaginatedCompareFn<Datum>
   filters?: Array<TablePaginatedFilter<TablePaginatedFilterType>>
+  groups?: { headerLabel: (key: PropertyKey) => string; keySelector: (datum: Datum) => PropertyKey }
   limit?: number
   path: string
+  skeleton?: TablePaginatedSkeleton
+  wrapCells?: boolean
 }
 
 export type TablePaginatedCounterComponent = React.FC<{ count: TablePaginatedCount }>
diff --git a/src/client/components/UserList/CollaboratorListElement/CollaboratorListElement.tsx b/src/client/components/UserList/CollaboratorListElement/CollaboratorListElement.tsx
deleted file mode 100644
index 949b7174e9..0000000000
--- a/src/client/components/UserList/CollaboratorListElement/CollaboratorListElement.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from 'react'
-
-import classNames from 'classnames'
-import { Objects } from 'utils/objects'
-
-import { RoleName, User, Users } from 'meta/user'
-import { UserRoles } from 'meta/user/userRoles'
-
-import { useCycle } from 'client/store/assessment'
-import { useUser } from 'client/store/user'
-import { useCountryIso } from 'client/hooks'
-import InvitationColumn from 'client/components/UserList/CollaboratorListElement/InvitationColumn'
-import UserEditColumn from 'client/components/UserList/CollaboratorListElement/UserEditColumn'
-
-import UserField from '../UserField'
-import UserRoleField from '../UserRoleField'
-
-const CollaboratorListElement: React.FC<{ user: User; readOnly: boolean }> = ({ user, readOnly }) => {
-  const countryIso = useCountryIso()
-  const cycle = useCycle()
-  const currentUser = useUser()
-  const isReviewer = Users.isReviewer(currentUser, countryIso, cycle)
-  const userRole = Users.getRole(user, countryIso, cycle)
-
-  if (Objects.isEmpty(userRole)) return null
-
-  const { acceptedAt, invitationUuid } = userRole
-
-  const showLink = !readOnly
-
-  // Show placeholder if user is a reviewer and the role is reviewer or
-  // if the current user is a reviewer and the user has not accepted the invitation
-  const showPlaceholder = (isReviewer && userRole.role === RoleName.REVIEWER) || (isReviewer && !acceptedAt)
-  const isInvitation = invitationUuid && !acceptedAt
-  const showInvitationColumn = isInvitation && !isReviewer
-  const showEditColumn = !showPlaceholder && !showInvitationColumn
-  const invitationExpired = UserRoles.isInvitationExpired(userRole)
-
-  return (
-    <tr
-      className={classNames({
-        'user-list__invitation-row': isInvitation,
-        expired: isInvitation && invitationExpired,
-      })}
-    >
-      <td className="user-list__cell">
-        <div className="user-list__cell--read-only">{Users.getFullName(user)}</div>
-      </td>
-      <UserRoleField user={user} countryIso={countryIso} />
-      <UserField user={user} field="email" />
-      {showLink && (
-        <td className="user-list__cell user-list__edit-column">
-          {showPlaceholder && <div />}
-          {showEditColumn && <UserEditColumn user={user} />}
-          {showInvitationColumn && <InvitationColumn user={user} userRole={userRole} invitationUuid={invitationUuid} />}
-        </td>
-      )}
-    </tr>
-  )
-}
-
-export default CollaboratorListElement
diff --git a/src/client/components/UserList/CollaboratorListElement/InvitationColumn.tsx b/src/client/components/UserList/CollaboratorListElement/InvitationColumn.tsx
deleted file mode 100644
index e427333d0b..0000000000
--- a/src/client/components/UserList/CollaboratorListElement/InvitationColumn.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import React, { useCallback, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { TooltipId } from 'meta/tooltip'
-import { RoleName, User, UserRole } from 'meta/user'
-import { UserRoles } from 'meta/user/userRoles'
-
-import { useUser } from 'client/store/user'
-import { useToaster } from 'client/hooks/useToaster'
-import Icon from 'client/components/Icon'
-
-import { useRemoveInvitation } from '../hooks/useRemoveInvitation'
-import { useResendInvitation } from '../hooks/useResendInvitation'
-import UserInvitationInfo from '../UserInvitationInfo'
-
-interface Props {
-  invitationUuid: string
-  userRole: UserRole<RoleName, any>
-  user: User
-}
-
-const InvitationColumn: React.FC<Props> = (props: Props) => {
-  const { invitationUuid, userRole, user } = props
-
-  const [showInvitationInfo, setShowInvitationInfo] = useState<boolean>(false)
-  const [resendInvitationLoading, setResendInvitationLoading] = useState<boolean>(false)
-
-  const { t } = useTranslation()
-  const { toaster } = useToaster()
-
-  const currentUser = useUser()
-
-  const callbackRemoveInvitation = useCallback(() => {
-    toaster.success(t('userManagement.invitationDeleted'))
-  }, [toaster, t])
-
-  const removeInvitation = useRemoveInvitation({
-    user,
-    invitationUuid,
-    callback: callbackRemoveInvitation,
-  })
-
-  const callbackResendInvitation = useCallback(() => {
-    toaster.success(t('userManagement.invitationEmailSent'))
-    setResendInvitationLoading(false)
-  }, [toaster, t])
-
-  const resendInvitation = useResendInvitation({
-    invitationUuid,
-    callback: callbackResendInvitation,
-  })
-
-  const onClickResend = useCallback(() => {
-    setResendInvitationLoading(true)
-    resendInvitation()
-  }, [resendInvitation])
-
-  const invitationExpired = UserRoles.isInvitationExpired(userRole)
-
-  return (
-    <>
-      {invitationExpired && (
-        <button
-          className="btn-s btn-link"
-          disabled={resendInvitationLoading}
-          onClick={onClickResend}
-          type="button"
-          data-tooltip-id={TooltipId.info}
-          data-tooltip-content={t('userManagement.inviteAgain')}
-        >
-          <Icon name="icon-paper-plane" />
-        </button>
-      )}
-      {!invitationExpired && (
-        <button
-          key={0}
-          className="btn-s btn-link"
-          onClick={() => setShowInvitationInfo(true)}
-          type="button"
-          data-tooltip-id={TooltipId.info}
-          data-tooltip-content={t('userManagement.invitationLink')}
-        >
-          <Icon name="round-e-info" />
-        </button>
-      )}
-
-      <button
-        key={1}
-        className="btn-s btn-link-destructive"
-        disabled={currentUser.id === user.id}
-        onClick={removeInvitation}
-        type="button"
-        data-tooltip-id={TooltipId.error}
-        data-tooltip-content={t('userManagement.remove')}
-      >
-        <Icon name="trash-simple" />
-      </button>
-      {showInvitationInfo ? <UserInvitationInfo user={user} onClose={() => setShowInvitationInfo(false)} /> : null}
-    </>
-  )
-}
-
-export default InvitationColumn
diff --git a/src/client/components/UserList/CollaboratorListElement/UserEditColumn.tsx b/src/client/components/UserList/CollaboratorListElement/UserEditColumn.tsx
deleted file mode 100644
index d5bce803d7..0000000000
--- a/src/client/components/UserList/CollaboratorListElement/UserEditColumn.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { Link } from 'react-router-dom'
-
-import { Routes } from 'meta/routes'
-import { TooltipId } from 'meta/tooltip'
-import { User, Users } from 'meta/user'
-
-import { useAssessment, useCycle } from 'client/store/assessment'
-import { useUser } from 'client/store/user'
-import { useCountryIso } from 'client/hooks'
-import Icon from 'client/components/Icon'
-
-interface Props {
-  user: User
-}
-
-const UserEditColumn: React.FC<Props> = (props: Props) => {
-  const { user } = props
-  const { t } = useTranslation()
-
-  const assessment = useAssessment()
-  const assessmentName = assessment.props.name
-  const cycle = useCycle()
-  const cycleName = cycle.name
-  const countryIso = useCountryIso()
-  const currentUser = useUser()
-
-  const currentUserIsNationalCorrespondent = Users.isNationalCorrespondent(currentUser, countryIso, cycle)
-  const currentUserIsAlternateNationalCorrespondent = Users.isAlternateNationalCorrespondent(
-    currentUser,
-    countryIso,
-    cycle
-  )
-
-  const userIsCollaborator = Users.isCollaborator(user, countryIso, cycle)
-
-  // National/Alternate national correspondents can edit only collaborators
-  if ((currentUserIsNationalCorrespondent || currentUserIsAlternateNationalCorrespondent) && !userIsCollaborator)
-    return null
-
-  const currentUserIsReviewer = Users.isReviewer(currentUser, countryIso, cycle)
-  const text = t(currentUserIsReviewer ? 'common.view' : 'userManagement.edit')
-  const icon = currentUserIsReviewer ? 'icon-eye' : 'pencil'
-
-  return (
-    <Link
-      to={Routes.CountryUser.generatePath({
-        countryIso,
-        assessmentName,
-        cycleName,
-        id: user.id,
-      })}
-      type="button"
-      className="btn-s btn-link"
-      data-tooltip-id={TooltipId.info}
-      data-tooltip-content={text}
-    >
-      <Icon name={icon} />
-    </Link>
-  )
-}
-
-export default UserEditColumn
diff --git a/src/client/components/UserList/CollaboratorListElement/index.ts b/src/client/components/UserList/CollaboratorListElement/index.ts
deleted file mode 100644
index 1e9ea38c21..0000000000
--- a/src/client/components/UserList/CollaboratorListElement/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './CollaboratorListElement'
diff --git a/src/client/components/UserList/InviteUserLink/index.ts b/src/client/components/UserList/InviteUserLink/index.ts
deleted file mode 100644
index ce4ff5b849..0000000000
--- a/src/client/components/UserList/InviteUserLink/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './InviteUserLink'
diff --git a/src/client/components/UserList/UserField/UserField.tsx b/src/client/components/UserList/UserField/UserField.tsx
deleted file mode 100644
index 54bb1e09ff..0000000000
--- a/src/client/components/UserList/UserField/UserField.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react'
-
-import { User } from 'meta/user'
-
-const UserField: React.FC<{ user: User; field: keyof User }> = ({ user, field }) => (
-  <td className="user-list__cell">
-    <div className="user-list__cell--read-only">{user[field] ? (user[field] as string) : '\xA0'}</div>
-  </td>
-)
-
-export default UserField
diff --git a/src/client/components/UserList/UserField/index.ts b/src/client/components/UserList/UserField/index.ts
deleted file mode 100644
index 8f194cfd9b..0000000000
--- a/src/client/components/UserList/UserField/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './UserField'
diff --git a/src/client/components/UserList/UserInvitationInfo/UserInvitationInfo.scss b/src/client/components/UserList/UserInvitationInfo/UserInvitationInfo.scss
deleted file mode 100644
index 5cb74a23bb..0000000000
--- a/src/client/components/UserList/UserInvitationInfo/UserInvitationInfo.scss
+++ /dev/null
@@ -1,65 +0,0 @@
-@import 'src/client/style/partials';
-
-.invitation-info-box {
-  position: absolute;
-  top: -1px;
-  right: -1px;
-  left: -200%;
-  background-color: $ui-bg;
-  color: $text-body;
-  border: 1px solid $ui-border-dark;
-  text-align: left;
-  z-index: 1;
-
-  .label {
-    margin: $spacing-xs;
-    font-weight: 600;
-  }
-
-  ul {
-    padding: 0;
-    margin-bottom: 0;
-
-    li {
-      list-style: none;
-      padding: $spacing-xs;
-      border-bottom: 1px solid $ui-border-dark;
-
-      &:first-child {
-        padding-top: 0;
-      }
-
-      &:last-child {
-        border: none;
-      }
-
-      .input-buttons-wrapper {
-        border: 1px solid $ui-border-dark;
-        display: flex;
-
-        input {
-          background-color: transparent;
-          border: none;
-          padding: 4px;
-          flex: auto;
-        }
-
-        button {
-          border-left: 1px solid $ui-border-dark;
-        }
-      }
-
-      .btn-link {
-        padding-left: 0;
-        padding-right: 0;
-      }
-    }
-  }
-
-  .invitation-info-box-close {
-    position: absolute;
-    top: $spacing-xxs;
-    right: $spacing-xxs;
-    cursor: pointer;
-  }
-}
diff --git a/src/client/components/UserList/UserInvitationInfo/UserInvitationInfo.tsx b/src/client/components/UserList/UserInvitationInfo/UserInvitationInfo.tsx
deleted file mode 100644
index 9964642e76..0000000000
--- a/src/client/components/UserList/UserInvitationInfo/UserInvitationInfo.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import './UserInvitationInfo.scss'
-import React, { useCallback } from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { Routes } from 'meta/routes'
-import { User, Users } from 'meta/user'
-
-import { useAssessment, useCycle } from 'client/store/assessment'
-import { useCountryIso } from 'client/hooks'
-import { useToaster } from 'client/hooks/useToaster'
-import Icon from 'client/components/Icon'
-
-import { useResendInvitation } from '../hooks/useResendInvitation'
-
-const UserInvitationInfo: React.FC<{ user: User; onClose: () => void }> = ({ user, onClose }) => {
-  const assessment = useAssessment()
-  const countryIso = useCountryIso()
-  const cycle = useCycle()
-  const { t } = useTranslation()
-  const { toaster } = useToaster()
-
-  const assessmentName = assessment.props.name
-  const cycleName = cycle.name
-
-  const { invitationUuid } = Users.getRole(user, countryIso, cycle)
-
-  const callback = useCallback(() => {
-    toaster.success(t('userManagement.invitationEmailSent'))
-    onClose()
-  }, [toaster, t, onClose])
-
-  const resendInvitation = useResendInvitation({
-    invitationUuid,
-    callback,
-  })
-
-  const url = `${window.location.origin}${Routes.LoginInvitation.generatePath(
-    { assessmentName, cycleName },
-    { invitationUuid, lang: user.props.lang }
-  )}`
-
-  return (
-    <div className="invitation-info-box">
-      <div className="label">{t('userManagement.invitationLink')}</div>
-      <ul>
-        <li>
-          <div className="input-buttons-wrapper">
-            <input type="text" defaultValue={url} />
-            <button
-              className="btn-transparent"
-              title={t('common.copyToClipboard')}
-              type="button"
-              onClick={() => {
-                navigator.clipboard.writeText(url).then(() => {
-                  toaster.info(t('userManagement.invitationLinkCopied'))
-                  onClose()
-                })
-              }}
-            >
-              <Icon name="content_copy" className="icon-no-margin icon-sub" />
-            </button>
-          </div>
-        </li>
-        <li>
-          <button className="btn-s btn-link" type="button" onClick={resendInvitation}>
-            {t('userManagement.sendInvitation')}
-          </button>
-        </li>
-      </ul>
-
-      <div className="invitation-info-box-close" onClick={onClose} role="button" tabIndex={0} aria-hidden="true">
-        <Icon name="remove" className="icon-no-margin icon-sub" />
-      </div>
-    </div>
-  )
-}
-
-export default UserInvitationInfo
diff --git a/src/client/components/UserList/UserInvitationInfo/index.ts b/src/client/components/UserList/UserInvitationInfo/index.ts
deleted file mode 100644
index 438f2e58b9..0000000000
--- a/src/client/components/UserList/UserInvitationInfo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './UserInvitationInfo'
diff --git a/src/client/components/UserList/UserList.scss b/src/client/components/UserList/UserList.scss
deleted file mode 100644
index 05a60b4630..0000000000
--- a/src/client/components/UserList/UserList.scss
+++ /dev/null
@@ -1,85 +0,0 @@
-@import 'src/client/style/partials';
-
-.user-list__table {
-  border-collapse: collapse;
-  font-size: $font-s;
-  line-height: 19px;
-  width: 100%;
-  table-layout: fixed;
-
-  tr {
-    &.user-list__invitation-row {
-      color: $text-disabled;
-      &.expired {
-        color: $ui-destructive;
-      }
-    }
-
-    &.user-list__disabled-user {
-      color: $text-disabled;
-      text-decoration: line-through;
-    }
-
-    th {
-      &.user-list__header-cell {
-        border-bottom: $ui-thin-border;
-        font-size: $font-m;
-        padding: 12px 10px;
-        text-align: left;
-        overflow-wrap: break-word;
-      }
-    }
-
-    td {
-      &.user-list__cell {
-        border: 1px solid transparent;
-        border-bottom-color: $ui-border;
-        padding: 0;
-        height: 1px;
-        text-align: left;
-        position: relative;
-
-        .user-list__cell--read-only {
-          cursor: default;
-          padding: 12px 10px;
-          word-break: break-word;
-        }
-      }
-      .btn-s {
-        svg {
-          margin: 0;
-          height: 13px;
-          width: 13px;
-          color: $ui-accent;
-        }
-        &.btn-link-destructive {
-          svg {
-            color: $ui-destructive;
-          }
-        }
-      }
-    }
-
-    th {
-      &.user-list__edit-column {
-        .btn-s {
-          margin-left: $spacing-xs;
-        }
-
-        .user-list__edit-column-buttons-container {
-          display: flex;
-          flex-direction: row;
-          justify-content: flex-end;
-          align-items: center;
-        }
-      }
-    }
-
-    td {
-      &.user-list__edit-column {
-        width: 140px;
-        text-align: right;
-      }
-    }
-  }
-}
diff --git a/src/client/components/UserList/UserList.tsx b/src/client/components/UserList/UserList.tsx
deleted file mode 100644
index 7c35fe707e..0000000000
--- a/src/client/components/UserList/UserList.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import './UserList.scss'
-import React from 'react'
-
-import { User } from 'meta/user'
-
-import CollaboratorListElement from './CollaboratorListElement'
-import UserListEmpty from './UserListEmpty'
-import UserListHeader from './UserListHeader'
-
-type Props = {
-  users: Array<User>
-  readOnly?: boolean
-}
-
-const UserList: React.FC<Props> = (props) => {
-  const { users, readOnly } = props
-
-  if (!users.length) return <UserListEmpty />
-
-  return (
-    <table className="user-list__table">
-      <UserListHeader readOnly={readOnly} />
-      <tbody>
-        {users.map((user: User) => (
-          <CollaboratorListElement key={user.id} readOnly={readOnly} user={user} />
-        ))}
-      </tbody>
-    </table>
-  )
-}
-
-UserList.defaultProps = {
-  readOnly: false,
-}
-
-export default UserList
diff --git a/src/client/components/UserList/UserListButtonExport/UserListButtonExport.tsx b/src/client/components/UserList/UserListButtonExport/UserListButtonExport.tsx
deleted file mode 100644
index 9ad683c5d8..0000000000
--- a/src/client/components/UserList/UserListButtonExport/UserListButtonExport.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react'
-import { CSVLink } from 'react-csv'
-import { useTranslation } from 'react-i18next'
-
-import { User, Users } from 'meta/user'
-
-import { useCycle } from 'client/store/assessment'
-import { useUsers } from 'client/store/ui/userManagement'
-import { useCountryIso } from 'client/hooks'
-import Icon from 'client/components/Icon'
-
-const UserListButtonExport = () => {
-  const { t } = useTranslation()
-  const users = useUsers()
-  const cycle = useCycle()
-  const countryIso = useCountryIso()
-
-  // ==== HEADERS
-  const csvRoleHeaders = () => [{ key: 'role', label: t('common.role') }]
-
-  const csvHeaders = () => [
-    { key: 'name', label: t('common.name') },
-    ...csvRoleHeaders(),
-    { key: 'email', label: t('common.email') },
-  ]
-
-  // ==== TABLE DATA
-
-  const csvRowData = (user: User) => {
-    const userRole = Users.getRole(user, countryIso, cycle)
-
-    return {
-      name: Users.getFullName(user),
-      role: `${t(Users.getI18nRoleLabelKey(userRole?.role))}${
-        userRole?.invitationUuid && !userRole.acceptedAt ? ` - ${t('admin.invitationPending')}` : ''
-      }`,
-      email: user.email,
-    }
-  }
-
-  const csvTableData = () => {
-    return users.map((user: User) => csvRowData(user))
-  }
-
-  return (
-    <CSVLink
-      className="btn-s btn-primary"
-      data={csvTableData()}
-      filename="FRA-Users.csv"
-      headers={csvHeaders()}
-      target="_blank"
-    >
-      <Icon className="icon-sub icon-white" name="hit-down" />
-      CSV
-    </CSVLink>
-  )
-}
-
-export default UserListButtonExport
diff --git a/src/client/components/UserList/UserListButtonExport/index.ts b/src/client/components/UserList/UserListButtonExport/index.ts
deleted file mode 100644
index ed0b40011b..0000000000
--- a/src/client/components/UserList/UserListButtonExport/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './UserListButtonExport'
diff --git a/src/client/components/UserList/UserListEmpty/UserListEmpty.tsx b/src/client/components/UserList/UserListEmpty/UserListEmpty.tsx
deleted file mode 100644
index fa2c448935..0000000000
--- a/src/client/components/UserList/UserListEmpty/UserListEmpty.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-
-import InviteUserLink from 'client/components/UserList/InviteUserLink'
-
-const UserListEmpty: React.FC = () => {
-  const { t } = useTranslation()
-
-  return (
-    <div className="landing__users-container">
-      <div className="landing__activity-empty">
-        <img src="/img/tucan.svg" height="72" alt="tucan" />
-        <p className="landing__activity-empty-title">{t('userManagement.noUsers')}</p>
-
-        <InviteUserLink className="btn-s btn-primary" />
-      </div>
-    </div>
-  )
-}
-
-export default UserListEmpty
diff --git a/src/client/components/UserList/UserListEmpty/index.ts b/src/client/components/UserList/UserListEmpty/index.ts
deleted file mode 100644
index 09c08bb1f1..0000000000
--- a/src/client/components/UserList/UserListEmpty/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './UserListEmpty'
diff --git a/src/client/components/UserList/UserListHeader/UserListHeader.tsx b/src/client/components/UserList/UserListHeader/UserListHeader.tsx
deleted file mode 100644
index 883ff0692a..0000000000
--- a/src/client/components/UserList/UserListHeader/UserListHeader.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-
-import InviteUserLink from 'client/components/UserList/InviteUserLink'
-import UserListButtonExport from 'client/components/UserList/UserListButtonExport'
-
-type Props = { readOnly: boolean }
-
-const UserListHeader: React.FC<Props> = (props) => {
-  const { readOnly } = props
-
-  const { t } = useTranslation()
-
-  return (
-    <thead>
-      <tr>
-        <th className="user-list__header-cell">{t('common.name')}</th>
-        <th className="user-list__header-cell">{t('common.role')}</th>
-        <th className="user-list__header-cell">{t('common.email')}</th>
-        {!readOnly && (
-          <th className="user-list__header-cell user-list__edit-column">
-            <div className="user-list__edit-column-buttons-container">
-              <UserListButtonExport />
-              <InviteUserLink />
-            </div>
-          </th>
-        )}
-      </tr>
-    </thead>
-  )
-}
-
-export default UserListHeader
diff --git a/src/client/components/UserList/UserListHeader/index.ts b/src/client/components/UserList/UserListHeader/index.ts
deleted file mode 100644
index 2ac40109b1..0000000000
--- a/src/client/components/UserList/UserListHeader/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './UserListHeader'
diff --git a/src/client/components/UserList/UserRoleField/UserRoleField.tsx b/src/client/components/UserList/UserRoleField/UserRoleField.tsx
deleted file mode 100644
index 04d4ee0c9d..0000000000
--- a/src/client/components/UserList/UserRoleField/UserRoleField.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { CountryIso } from 'meta/area'
-import { User, Users } from 'meta/user'
-
-import { useCycle } from 'client/store/assessment'
-
-const UserRoleField: React.FC<{ user: User; countryIso: CountryIso }> = ({ user, countryIso }) => {
-  const { t } = useTranslation()
-  const cycle = useCycle()
-
-  return (
-    <td className="user-list__cell">
-      <div className="user-list__cell--read-only">
-        {t(Users.getI18nRoleLabelKey(Users.getRole(user, countryIso, cycle)?.role))}
-      </div>
-    </td>
-  )
-}
-
-export default UserRoleField
diff --git a/src/client/components/UserList/UserRoleField/index.ts b/src/client/components/UserList/UserRoleField/index.ts
deleted file mode 100644
index 11316f2c9d..0000000000
--- a/src/client/components/UserList/UserRoleField/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './UserRoleField'
diff --git a/src/client/components/UserList/UserRolesField/UserRolesField.tsx b/src/client/components/UserList/UserRolesField/UserRolesField.tsx
deleted file mode 100644
index 37d08cac14..0000000000
--- a/src/client/components/UserList/UserRolesField/UserRolesField.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { Areas } from 'meta/area'
-import { TooltipId } from 'meta/tooltip'
-import { RoleName, User, Users } from 'meta/user'
-
-const UserRolesField: React.FC<{ roleName: RoleName; user: User }> = ({ roleName, user }) => {
-  const { t } = useTranslation()
-
-  const roles = user.roles
-    .filter((role) => role.role === roleName)
-    .map((role) =>
-      role.role === RoleName.ADMINISTRATOR
-        ? t(Users.getI18nRoleLabelKey(role.role))
-        : t(Areas.getTranslationKey(role.countryIso))
-    )
-
-  const firstThreeRoles = roles.length > 3 ? `${roles.slice(0, 3).join(', ')}...` : roles.join(', ')
-
-  const otherRoles = roles.length > 3 ? roles.join(', ') : null
-
-  return (
-    <td className="user-list__cell">
-      <div className="user-list__cell--read-only" data-tooltip-id={TooltipId.info} data-tooltip-content={otherRoles}>
-        {firstThreeRoles}
-      </div>
-    </td>
-  )
-}
-
-export default UserRolesField
diff --git a/src/client/components/UserList/UserRolesField/index.ts b/src/client/components/UserList/UserRolesField/index.ts
deleted file mode 100644
index 22c09273d3..0000000000
--- a/src/client/components/UserList/UserRolesField/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './UserRolesField'
diff --git a/src/client/components/UserList/hooks/useRemoveInvitation.ts b/src/client/components/UserList/hooks/useRemoveInvitation.ts
deleted file mode 100644
index d86abdacf2..0000000000
--- a/src/client/components/UserList/hooks/useRemoveInvitation.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useCallback } from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { CountryIso } from 'meta/area'
-import { User, Users } from 'meta/user'
-
-import { useAppDispatch } from 'client/store'
-import { UserManagementActions } from 'client/store/ui/userManagement'
-import { useCountryRouteParams } from 'client/hooks/useRouteParams'
-
-type Props = {
-  invitationUuid: string
-  callback: () => void
-  user: User
-}
-
-export const useRemoveInvitation = (props: Props) => {
-  const { invitationUuid, callback, user } = props
-
-  const { t } = useTranslation()
-  const dispatch = useAppDispatch()
-  const { assessmentName, cycleName, countryIso } = useCountryRouteParams()
-
-  return useCallback(() => {
-    if (window.confirm(t('userManagement.confirmDelete', { user: Users.getFullName(user) })))
-      dispatch(
-        UserManagementActions.removeInvitation({
-          assessmentName,
-          cycleName,
-          countryIso: countryIso as CountryIso,
-          invitationUuid,
-        })
-      ).then(callback)
-  }, [t, user, dispatch, assessmentName, cycleName, countryIso, invitationUuid, callback])
-}
diff --git a/src/client/components/UserList/hooks/useResendInvitation.ts b/src/client/components/UserList/hooks/useResendInvitation.ts
deleted file mode 100644
index 43bb3dd672..0000000000
--- a/src/client/components/UserList/hooks/useResendInvitation.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useCallback } from 'react'
-
-import { CountryIso } from 'meta/area'
-
-import { useAppDispatch } from 'client/store'
-import { UserManagementActions } from 'client/store/ui/userManagement'
-import { useCountryRouteParams } from 'client/hooks/useRouteParams'
-
-type Props = {
-  invitationUuid: string
-  callback: () => void
-}
-
-export const useResendInvitation = (props: Props) => {
-  const { invitationUuid, callback } = props
-  const dispatch = useAppDispatch()
-  const { assessmentName, cycleName, countryIso } = useCountryRouteParams()
-
-  return useCallback(() => {
-    dispatch(
-      UserManagementActions.sendInvitationEmail({
-        assessmentName,
-        countryIso: countryIso as CountryIso,
-        cycleName,
-        invitationUuid,
-      })
-    ).then(callback)
-  }, [dispatch, assessmentName, countryIso, cycleName, invitationUuid, callback])
-}
diff --git a/src/client/pages/Admin/Admin.tsx b/src/client/pages/Admin/Admin.tsx
index 28786f3d02..10b2426ca7 100644
--- a/src/client/pages/Admin/Admin.tsx
+++ b/src/client/pages/Admin/Admin.tsx
@@ -27,8 +27,8 @@ const sections: Array<Section> = [
     labelKey: 'common.invitations',
   },
   {
-    name: SectionNames.Admin.userManagement,
-    labelKey: 'landing.sections.userManagement',
+    name: SectionNames.Admin.collaborators,
+    labelKey: 'common.collaborators',
   },
   {
     name: SectionNames.Admin.links,
diff --git a/src/client/pages/Admin/UserManagement/RoleField/RoleField.scss b/src/client/pages/Admin/UserManagement/RoleField/RoleField.scss
deleted file mode 100644
index c1340ae1aa..0000000000
--- a/src/client/pages/Admin/UserManagement/RoleField/RoleField.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.admin-user-management__role-field {
-  text-align: left;
-  word-break: break-word;
-}
diff --git a/src/client/pages/Admin/UserManagement/RoleField/RoleField.tsx b/src/client/pages/Admin/UserManagement/RoleField/RoleField.tsx
deleted file mode 100644
index 3a8d7ff524..0000000000
--- a/src/client/pages/Admin/UserManagement/RoleField/RoleField.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import './RoleField.scss'
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { Areas } from 'meta/area'
-import { TooltipId } from 'meta/tooltip'
-import { RoleName, User, Users } from 'meta/user'
-
-type Props = {
-  roleName: RoleName
-  user: User
-}
-
-const RoleField: React.FC<Props> = (props: Props) => {
-  const { roleName, user } = props
-  const { t } = useTranslation()
-
-  const roles = user.roles
-    .filter((role) => role.role === roleName)
-    .map((role) =>
-      role.role === RoleName.ADMINISTRATOR
-        ? t(Users.getI18nRoleLabelKey(role.role))
-        : t(Areas.getTranslationKey(role.countryIso))
-    )
-
-  const firstThreeRoles = roles.length > 3 ? `${roles.slice(0, 3).join(', ')}...` : roles.join(', ')
-
-  const allRoles = roles.length > 3 ? roles.join(', ') : null
-
-  return (
-    <div className="admin-user-management__role-field" data-tooltip-content={allRoles} data-tooltip-id={TooltipId.info}>
-      {firstThreeRoles}
-    </div>
-  )
-}
-
-export default RoleField
diff --git a/src/client/pages/Admin/UserManagement/hooks/useColumns.tsx b/src/client/pages/Admin/UserManagement/hooks/useColumns.tsx
deleted file mode 100644
index a80e00d1c5..0000000000
--- a/src/client/pages/Admin/UserManagement/hooks/useColumns.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React, { useMemo } from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { RoleName, User, Users } from 'meta/user'
-
-import { Column } from 'client/components/TablePaginated'
-import NameField from 'client/pages/Admin/UserManagement/NameField'
-import RoleField from 'client/pages/Admin/UserManagement/RoleField'
-
-type Returned = Array<Column<User>>
-
-export const useColumns = (): Returned => {
-  const { t } = useTranslation()
-
-  return useMemo<Returned>(() => {
-    const roleColumns: Returned = Object.values(RoleName).map((roleName) => ({
-      component: ({ datum }) => <RoleField roleName={roleName} user={datum} />,
-      header: t(Users.getI18nRoleLabelKey(roleName)),
-      key: roleName,
-    }))
-
-    return [
-      {
-        component: ({ datum }) => <NameField user={datum} />,
-        header: t('common.name'),
-        key: 'name',
-        orderByProperty: 'name',
-      },
-      ...roleColumns,
-    ]
-  }, [t])
-}
diff --git a/src/client/pages/Admin/UserManagement/index.ts b/src/client/pages/Admin/UserManagement/index.ts
deleted file mode 100644
index db4bfa42e7..0000000000
--- a/src/client/pages/Admin/UserManagement/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './UserManagement'
diff --git a/src/client/pages/Admin/UserManagement/UserManagement.tsx b/src/client/pages/AdminCollaborators/AdminCollaborators.tsx
similarity index 90%
rename from src/client/pages/Admin/UserManagement/UserManagement.tsx
rename to src/client/pages/AdminCollaborators/AdminCollaborators.tsx
index 85a617b0d2..571f3a7f72 100644
--- a/src/client/pages/Admin/UserManagement/UserManagement.tsx
+++ b/src/client/pages/AdminCollaborators/AdminCollaborators.tsx
@@ -3,10 +3,10 @@ import React from 'react'
 import { ApiEndPoint } from 'meta/api/endpoint'
 
 import TablePaginated from 'client/components/TablePaginated'
-import UsersCount from 'client/pages/Admin/UserManagement/UsersCount'
 
 import { useColumns } from './hooks/useColumns'
 import { useFilters } from './hooks/useFilters'
+import UsersCount from './UsersCount'
 
 const UserManagement: React.FC = () => {
   const columns = useColumns()
diff --git a/src/client/pages/Admin/UserManagement/NameField/NameField.scss b/src/client/pages/AdminCollaborators/NameField/NameField.scss
similarity index 100%
rename from src/client/pages/Admin/UserManagement/NameField/NameField.scss
rename to src/client/pages/AdminCollaborators/NameField/NameField.scss
diff --git a/src/client/pages/Admin/UserManagement/NameField/NameField.tsx b/src/client/pages/AdminCollaborators/NameField/NameField.tsx
similarity index 68%
rename from src/client/pages/Admin/UserManagement/NameField/NameField.tsx
rename to src/client/pages/AdminCollaborators/NameField/NameField.tsx
index e404dc9c6b..77f9d1a889 100644
--- a/src/client/pages/Admin/UserManagement/NameField/NameField.tsx
+++ b/src/client/pages/AdminCollaborators/NameField/NameField.tsx
@@ -4,30 +4,26 @@ import { Link } from 'react-router-dom'
 
 import { Global } from 'meta/area'
 import { Routes } from 'meta/routes'
-import { User, Users } from 'meta/user'
+import { CountryUserSummary } from 'meta/user'
 
 import { useCycleRouteParams } from 'client/hooks/useRouteParams'
 import Icon from 'client/components/Icon'
 
 type Props = {
-  user: User
+  userSummary: CountryUserSummary
 }
 
 const NameField: React.FC<Props> = (props: Props) => {
-  const { user } = props
+  const { userSummary } = props
+  const { id, fullName } = userSummary
 
   const { assessmentName, cycleName } = useCycleRouteParams()
 
-  const url = Routes.CountryUser.generatePath({
-    assessmentName,
-    countryIso: Global.WO,
-    cycleName,
-    id: user.id,
-  })
+  const url = Routes.CountryUser.generatePath({ assessmentName, countryIso: Global.WO, cycleName, id })
 
   return (
     <Link className="admin-user-management__user-link" rel="noreferrer" target="_blank" to={url}>
-      {Users.getFullName(user)}
+      {fullName}
       <Icon name="external-link" />
     </Link>
   )
diff --git a/src/client/pages/Admin/UserManagement/NameField/index.ts b/src/client/pages/AdminCollaborators/NameField/index.ts
similarity index 100%
rename from src/client/pages/Admin/UserManagement/NameField/index.ts
rename to src/client/pages/AdminCollaborators/NameField/index.ts
diff --git a/src/client/pages/AdminCollaborators/RoleField/RoleField.scss b/src/client/pages/AdminCollaborators/RoleField/RoleField.scss
new file mode 100644
index 0000000000..c1d06df400
--- /dev/null
+++ b/src/client/pages/AdminCollaborators/RoleField/RoleField.scss
@@ -0,0 +1,15 @@
+@import 'src/client/style/partials';
+
+.admin-user-management__role-field {
+  text-align: left;
+  word-break: break-word;
+
+  .invitation {
+    color: $text-disabled;
+    font-style: italic;
+  }
+
+  span:not(:last-child)::after {
+    content: ',  ';
+  }
+}
diff --git a/src/client/pages/AdminCollaborators/RoleField/RoleField.tsx b/src/client/pages/AdminCollaborators/RoleField/RoleField.tsx
new file mode 100644
index 0000000000..0f378c5ef9
--- /dev/null
+++ b/src/client/pages/AdminCollaborators/RoleField/RoleField.tsx
@@ -0,0 +1,68 @@
+import './RoleField.scss'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+
+import classNames from 'classnames'
+import { TFunction } from 'i18next'
+
+import { Areas, CountryIso } from 'meta/area'
+import { TooltipId } from 'meta/tooltip'
+import { CountryUserSummary, RoleName, Users } from 'meta/user'
+
+type Props = {
+  roleName: RoleName
+  userSummary: CountryUserSummary
+}
+
+const _getAllRolesAndInvitations = (props: Props): Array<{ countryIso: CountryIso; invitation?: boolean }> => {
+  const { userSummary, roleName } = props
+
+  const invitations = userSummary.invitations
+    ?.filter((role) => role.role === roleName)
+    .map(({ countryIso }) => ({ countryIso, invitation: true }))
+
+  const roles = userSummary.roles?.filter((role) => role.role === roleName).map(({ countryIso }) => ({ countryIso }))
+
+  return [...(roles ?? []), ...(invitations ?? [])]
+}
+
+const _getRoleLabel = (countryIso: CountryIso, roleName: RoleName, invitation: boolean, t: TFunction): string => {
+  const baseLabel =
+    roleName === RoleName.ADMINISTRATOR
+      ? t(Users.getI18nRoleLabelKey(RoleName.ADMINISTRATOR))
+      : t(Areas.getTranslationKey(countryIso))
+
+  return invitation ? `${baseLabel} (${t('admin.invitationPending')})` : baseLabel
+}
+
+const RoleField: React.FC<Props> = (props: Props) => {
+  const { roleName, userSummary } = props
+  const { t } = useTranslation()
+
+  const allItems = _getAllRolesAndInvitations({ roleName, userSummary })
+
+  const shouldCut = allItems.length > 3
+  const firstThreeItems = shouldCut ? allItems.slice(0, 3) : allItems
+
+  const tooltipContent = shouldCut
+    ? allItems
+        .map(({ countryIso, invitation }) => _getRoleLabel(countryIso, roleName, invitation ?? false, t))
+        .join(', ')
+    : ''
+
+  return (
+    <div
+      className="admin-user-management__role-field"
+      data-tooltip-content={tooltipContent}
+      data-tooltip-id={TooltipId.info}
+    >
+      {firstThreeItems.map(({ countryIso, invitation }) => (
+        <span key={`${userSummary.uuid}-${countryIso}`} className={classNames({ invitation })}>
+          {_getRoleLabel(countryIso, roleName, false, t)}
+        </span>
+      ))}
+    </div>
+  )
+}
+
+export default RoleField
diff --git a/src/client/pages/Admin/UserManagement/RoleField/index.ts b/src/client/pages/AdminCollaborators/RoleField/index.ts
similarity index 100%
rename from src/client/pages/Admin/UserManagement/RoleField/index.ts
rename to src/client/pages/AdminCollaborators/RoleField/index.ts
diff --git a/src/client/pages/Admin/UserManagement/UsersCount/UsersCount.scss b/src/client/pages/AdminCollaborators/UsersCount/UsersCount.scss
similarity index 100%
rename from src/client/pages/Admin/UserManagement/UsersCount/UsersCount.scss
rename to src/client/pages/AdminCollaborators/UsersCount/UsersCount.scss
diff --git a/src/client/pages/Admin/UserManagement/UsersCount/UsersCount.tsx b/src/client/pages/AdminCollaborators/UsersCount/UsersCount.tsx
similarity index 100%
rename from src/client/pages/Admin/UserManagement/UsersCount/UsersCount.tsx
rename to src/client/pages/AdminCollaborators/UsersCount/UsersCount.tsx
diff --git a/src/client/pages/Admin/UserManagement/UsersCount/index.ts b/src/client/pages/AdminCollaborators/UsersCount/index.ts
similarity index 100%
rename from src/client/pages/Admin/UserManagement/UsersCount/index.ts
rename to src/client/pages/AdminCollaborators/UsersCount/index.ts
diff --git a/src/client/pages/AdminCollaborators/hooks/useColumns.tsx b/src/client/pages/AdminCollaborators/hooks/useColumns.tsx
new file mode 100644
index 0000000000..1116ad3c39
--- /dev/null
+++ b/src/client/pages/AdminCollaborators/hooks/useColumns.tsx
@@ -0,0 +1,42 @@
+import React, { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { CountryUserSummary, RoleName, Users } from 'meta/user'
+
+import { Column } from 'client/components/TablePaginated'
+
+import NameField from '../NameField'
+import RoleField from '../RoleField'
+
+type Returned = Array<Column<CountryUserSummary>>
+
+const roles = [
+  RoleName.ADMINISTRATOR,
+  RoleName.REVIEWER,
+  RoleName.NATIONAL_CORRESPONDENT,
+  RoleName.ALTERNATE_NATIONAL_CORRESPONDENT,
+  RoleName.COLLABORATOR,
+  RoleName.VIEWER,
+]
+
+export const useColumns = (): Returned => {
+  const { t } = useTranslation()
+
+  return useMemo<Returned>(() => {
+    const roleColumns: Returned = roles.map((roleName) => ({
+      component: ({ datum }) => <RoleField roleName={roleName} userSummary={datum} />,
+      header: t(Users.getI18nRoleLabelKey(roleName)),
+      key: roleName,
+    }))
+
+    return [
+      {
+        component: ({ datum }) => <NameField userSummary={datum} />,
+        header: t('common.name'),
+        key: 'full_name',
+        orderByProperty: 'full_name',
+      },
+      ...roleColumns,
+    ]
+  }, [t])
+}
diff --git a/src/client/pages/Admin/UserManagement/hooks/useFilters.tsx b/src/client/pages/AdminCollaborators/hooks/useFilters.tsx
similarity index 88%
rename from src/client/pages/Admin/UserManagement/hooks/useFilters.tsx
rename to src/client/pages/AdminCollaborators/hooks/useFilters.tsx
index 8af316f211..1295b05372 100644
--- a/src/client/pages/Admin/UserManagement/hooks/useFilters.tsx
+++ b/src/client/pages/AdminCollaborators/hooks/useFilters.tsx
@@ -45,6 +45,12 @@ export const useFilters = (): Returned => {
         label: t('common.countries'),
         type: TablePaginatedFilterType.COUNTRY,
       },
+      {
+        defaultValue: false,
+        fieldName: 'disabled',
+        label: t('admin.disabledUsers'),
+        type: TablePaginatedFilterType.SWITCH,
+      },
     ]
   }, [t])
 }
diff --git a/src/client/pages/AdminCollaborators/index.ts b/src/client/pages/AdminCollaborators/index.ts
new file mode 100644
index 0000000000..92d8e434cf
--- /dev/null
+++ b/src/client/pages/AdminCollaborators/index.ts
@@ -0,0 +1 @@
+export { default } from './AdminCollaborators'
diff --git a/src/client/pages/AdminInvitations/AdminInvitations.tsx b/src/client/pages/AdminInvitations/AdminInvitations.tsx
index ff9e5b414f..18acc49316 100644
--- a/src/client/pages/AdminInvitations/AdminInvitations.tsx
+++ b/src/client/pages/AdminInvitations/AdminInvitations.tsx
@@ -52,7 +52,7 @@ const useColumns = (): Array<Column<UserInvitationSummary>> => {
         orderByProperty: 'accepted_at',
       },
       {
-        component: ({ datum }) => <Expired role={datum} />,
+        component: ({ datum }) => <Expired userInvitation={datum} />,
         header: t('common.expired'),
         key: 'expired',
       },
diff --git a/src/client/pages/AdminInvitations/Expired/Expired.tsx b/src/client/pages/AdminInvitations/Expired/Expired.tsx
index 59e99be863..cc6e9b5784 100644
--- a/src/client/pages/AdminInvitations/Expired/Expired.tsx
+++ b/src/client/pages/AdminInvitations/Expired/Expired.tsx
@@ -3,19 +3,20 @@ import { useTranslation } from 'react-i18next'
 
 import { Objects } from 'utils/objects'
 
-import { UserInvitationSummary } from 'meta/user/userInvitationSummary'
-import { UserRoles } from 'meta/user/userRoles'
+import { UserInvitations, UserInvitationSummary } from 'meta/user'
 
 type Props = {
-  role: UserInvitationSummary
+  userInvitation: UserInvitationSummary
 }
 
 const Expired: React.FC<Props> = (props: Props) => {
-  const { role } = props
+  const { userInvitation } = props
   const { t } = useTranslation()
 
   const isExpired =
-    !Objects.isEmpty(role.invitedAt) && Objects.isEmpty(role.acceptedAt) && UserRoles.isInvitationExpired(role)
+    !Objects.isEmpty(userInvitation.invitedAt) &&
+    Objects.isEmpty(userInvitation.acceptedAt) &&
+    UserInvitations.isExpired(userInvitation)
 
   if (isExpired) {
     return <span>{t('common.yes')}</span>
diff --git a/src/client/pages/CountryHome/FraHome/Collaborators/Collaborators.tsx b/src/client/pages/CountryHome/Collaborators/Collaborators.tsx
similarity index 50%
rename from src/client/pages/CountryHome/FraHome/Collaborators/Collaborators.tsx
rename to src/client/pages/CountryHome/Collaborators/Collaborators.tsx
index 60e67abbdc..522acc515c 100644
--- a/src/client/pages/CountryHome/FraHome/Collaborators/Collaborators.tsx
+++ b/src/client/pages/CountryHome/Collaborators/Collaborators.tsx
@@ -3,17 +3,15 @@ import { Route, Routes } from 'react-router-dom'
 
 import { Routes as ApplicationRoutes } from 'meta/routes'
 
-import { useUsers } from 'client/store/ui/userManagement'
 import InviteUserForm from 'client/components/InviteUserForm'
-import UserList from 'client/components/UserList'
 
-const Collaborators: React.FC = () => {
-  const users = useUsers()
+import UserList from './UserList'
 
+const Collaborators: React.FC = () => {
   return (
     <Routes>
-      <Route path={ApplicationRoutes.CountryHomeSectionInvite.path.relative} element={<InviteUserForm />} />
-      <Route index element={<UserList users={users} />} />
+      <Route element={<InviteUserForm />} path={ApplicationRoutes.CountryHomeSectionInvite.path.relative} />
+      <Route element={<UserList />} index />
     </Routes>
   )
 }
diff --git a/src/client/components/UserList/InviteUserLink/InviteUserLink.tsx b/src/client/pages/CountryHome/Collaborators/UserList/Invite/Invite.tsx
similarity index 66%
rename from src/client/components/UserList/InviteUserLink/InviteUserLink.tsx
rename to src/client/pages/CountryHome/Collaborators/UserList/Invite/Invite.tsx
index a9ea4cd5b4..bb68203b33 100644
--- a/src/client/components/UserList/InviteUserLink/InviteUserLink.tsx
+++ b/src/client/pages/CountryHome/Collaborators/UserList/Invite/Invite.tsx
@@ -2,38 +2,34 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Link } from 'react-router-dom'
 
-import classNames from 'classnames'
-
 import { Routes } from 'meta/routes'
 import { Users } from 'meta/user'
 
 import { useCycle } from 'client/store/assessment'
 import { useUser } from 'client/store/user'
 import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import { ButtonSize, useButtonClassName } from 'client/components/Buttons/Button'
 import Icon from 'client/components/Icon'
 
-type Props = {
-  className?: string
-}
-
-const InviteUserLink: React.FC<Props> = (props) => {
-  const { className } = props
+const Invite: React.FC = () => {
   const { t } = useTranslation()
   const user = useUser()
   const { countryIso } = useCountryRouteParams()
   const cycle = useCycle()
+  const className = useButtonClassName({
+    className: 'btn-invite',
+    iconName: 'small-add',
+    label: 'L',
+    size: ButtonSize.s,
+  })
 
   if (!Users.getRolesAllowedToEdit({ user, countryIso, cycle }).length) return null
 
   return (
-    <Link to={Routes.CountryHomeSectionInvite.path.relative} className={classNames('btn-s', 'btn-primary', className)}>
+    <Link className={className} to={Routes.CountryHomeSectionInvite.path.relative}>
       <Icon className="icon-sub icon-white" name="small-add" /> {t('userManagement.addUser')}
     </Link>
   )
 }
 
-InviteUserLink.defaultProps = {
-  className: '',
-}
-
-export default InviteUserLink
+export default Invite
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/Invite/index.ts b/src/client/pages/CountryHome/Collaborators/UserList/Invite/index.ts
new file mode 100644
index 0000000000..9710d7f3d9
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/Invite/index.ts
@@ -0,0 +1 @@
+export { default } from './Invite'
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Actions.scss b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Actions.scss
new file mode 100644
index 0000000000..801e9717d3
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Actions.scss
@@ -0,0 +1,12 @@
+.home-user-actions {
+  align-items: center;
+  display: flex;
+  gap: 8px;
+  grid-column: 2;
+  justify-self: flex-start;
+
+  .hr {
+    width: 1px;
+    height: 16px;
+  }
+}
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Actions.tsx b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Actions.tsx
new file mode 100644
index 0000000000..85126d6bb0
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Actions.tsx
@@ -0,0 +1,34 @@
+import './Actions.scss'
+import React from 'react'
+
+import Hr from 'client/components/Hr'
+
+import { Props } from '../Props'
+import { useActions } from './useActions'
+
+const Actions: React.FC<Props> = (props: Props) => {
+  const { user } = props
+
+  const actions = useActions(props)
+
+  return (
+    <div className="home-user-actions">
+      {actions.map(({ name, Component }, i) => {
+        const isLast = i === actions.length - 1
+
+        const base = `home-user-action-button`
+        const key = `${base}-${name}`
+        const keyHr = `${base}-hr`
+
+        return (
+          <React.Fragment key={key}>
+            <Component user={user} />
+            {!isLast && <Hr className={keyHr} />}
+          </React.Fragment>
+        )
+      })}
+    </div>
+  )
+}
+
+export default Actions
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/CopyLink/CopyLink.tsx b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/CopyLink/CopyLink.tsx
new file mode 100644
index 0000000000..081c46c138
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/CopyLink/CopyLink.tsx
@@ -0,0 +1,56 @@
+import React, { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { CountryIso } from 'meta/area'
+import { Routes } from 'meta/routes'
+import { UserInvitations as UserInvitationMeta } from 'meta/user'
+import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
+
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import { useToaster } from 'client/hooks/useToaster'
+import Button, { ButtonSize, ButtonType } from 'client/components/Buttons/Button'
+
+import { Props } from '../../Props'
+
+const CopyLink: React.FC<Props> = (props: Props) => {
+  const { user } = props
+
+  const { assessmentName, cycleName, countryIso } = useCountryRouteParams<CountryIso>()
+  const { t } = useTranslation()
+  const { toaster } = useToaster()
+
+  const { invitation } = CountryUserSummaries.getCountryRoleAndInvitation(user, countryIso)
+
+  const onClick = useCallback(() => {
+    const { lang } = user
+    const { uuid: invitationUuid } = invitation
+
+    const { origin } = window.location
+    const invitationPath = Routes.LoginInvitation.generatePath({ assessmentName, cycleName }, { invitationUuid, lang })
+    const url = `${origin}${invitationPath}`
+
+    navigator.clipboard.writeText(url).then(() => {
+      toaster.info(t('userManagement.invitationLinkCopied'))
+    })
+  }, [assessmentName, user, cycleName, invitation, t, toaster])
+
+  const isInvitation = CountryUserSummaries.isInvitation(user, countryIso)
+
+  if (!isInvitation || UserInvitationMeta.isExpired(invitation)) {
+    return null
+  }
+
+  return (
+    <Button
+      className="home-user-action-button-copy"
+      iconName="content_copy"
+      inverse
+      label={t('common.copyLink')}
+      onClick={onClick}
+      size={ButtonSize.xs}
+      type={ButtonType.primary}
+    />
+  )
+}
+
+export default CopyLink
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/CopyLink/index.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/CopyLink/index.ts
new file mode 100644
index 0000000000..b8a43493cc
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/CopyLink/index.ts
@@ -0,0 +1 @@
+export { default } from './CopyLink'
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Edit/Edit.tsx b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Edit/Edit.tsx
new file mode 100644
index 0000000000..fcb0f06e06
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Edit/Edit.tsx
@@ -0,0 +1,47 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { Link } from 'react-router-dom'
+
+import { CountryIso } from 'meta/area'
+import { Routes } from 'meta/routes'
+import { Authorizer } from 'meta/user'
+import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
+
+import { useCycle } from 'client/store/assessment'
+import { useUser } from 'client/store/user'
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import { ButtonSize, ButtonType, useButtonClassName } from 'client/components/Buttons/Button'
+import Icon from 'client/components/Icon'
+
+import { Props } from '../../Props'
+
+const size = ButtonSize.xs
+const type = ButtonType.primary
+
+const Edit: React.FC<Props> = (props: Props) => {
+  const { user } = props
+  const { id } = user
+
+  const { t } = useTranslation()
+  const { assessmentName, cycleName, countryIso } = useCountryRouteParams<CountryIso>()
+  const currentUser = useUser()
+  const cycle = useCycle()
+
+  const isEdit = Authorizer.canEditUser({ cycle, countryIso, user: currentUser, target: user })
+  const label = t(isEdit ? 'userManagement.edit' : 'common.view')
+  const iconName = isEdit ? 'pencil' : 'icon-eye'
+  const className = useButtonClassName({ iconName, label, size, type, className: 'home-user-action-button-edit' })
+
+  if (CountryUserSummaries.isInvitation(user, countryIso)) {
+    return null
+  }
+
+  const to = Routes.CountryUser.generatePath({ countryIso, assessmentName, cycleName, id })
+
+  return (
+    <Link className={className} to={to} type="button">
+      <Icon name={iconName} /> {label}
+    </Link>
+  )
+}
+export default Edit
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Edit/index.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Edit/index.ts
new file mode 100644
index 0000000000..d667e695d5
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Edit/index.ts
@@ -0,0 +1 @@
+export { default } from './Edit'
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Message/Message.tsx b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Message/Message.tsx
new file mode 100644
index 0000000000..295acef64f
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Message/Message.tsx
@@ -0,0 +1,32 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { MessageTopicType, Topics } from 'meta/messageCenter'
+
+import { useUser } from 'client/store/user'
+import { ButtonSize } from 'client/components/Buttons/Button'
+import MessageButton from 'client/pages/CountryHome/MessageButton'
+
+import { Props } from '../../Props'
+
+const Message: React.FC<Props> = (props: Props) => {
+  const { user } = props
+
+  const { t } = useTranslation()
+  const currentUser = useUser()
+
+  return (
+    <MessageButton
+      label={t('landing.users.message')}
+      size={ButtonSize.xs}
+      topic={{
+        key: Topics.getMessageBoardChatKey(user, currentUser),
+        subtitle: t('landing.users.message'),
+        title: user.fullName,
+        type: MessageTopicType.chat,
+      }}
+    />
+  )
+}
+
+export default Message
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Message/index.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Message/index.ts
new file mode 100644
index 0000000000..b75f4331e2
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Message/index.ts
@@ -0,0 +1 @@
+export { default } from './Message'
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Remove/Remove.tsx b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Remove/Remove.tsx
new file mode 100644
index 0000000000..7dc76bdfcb
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Remove/Remove.tsx
@@ -0,0 +1,49 @@
+import React, { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { CountryIso } from 'meta/area'
+import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
+
+import { useUser } from 'client/store/user'
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import { useToaster } from 'client/hooks/useToaster'
+import Button, { ButtonSize, ButtonType } from 'client/components/Buttons/Button'
+
+import type { Props } from '../../Props'
+import { useRemoveInvitation } from './hooks/useRemoveInvitation'
+
+const Remove: React.FC<Props> = (props: Props) => {
+  const { user } = props
+
+  const { countryIso } = useCountryRouteParams<CountryIso>()
+
+  const { t } = useTranslation()
+  const { toaster } = useToaster()
+  const currentUser = useUser()
+
+  const callback = useCallback(() => {
+    toaster.error(t('userManagement.invitationDeleted'))
+  }, [toaster, t])
+
+  const removeInvitation = useRemoveInvitation({ user, callback })
+
+  if (!CountryUserSummaries.isInvitation(user, countryIso)) {
+    return null
+  }
+
+  return (
+    <Button
+      className="home-user-action-button-remove"
+      disabled={currentUser.uuid === user.uuid}
+      iconName="trash-simple"
+      inverse
+      label={t('common.remove')}
+      noBorder
+      onClick={removeInvitation}
+      size={ButtonSize.xs}
+      type={ButtonType.danger}
+    />
+  )
+}
+
+export default Remove
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Remove/hooks/useRemoveInvitation.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Remove/hooks/useRemoveInvitation.ts
new file mode 100644
index 0000000000..5463367342
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Remove/hooks/useRemoveInvitation.ts
@@ -0,0 +1,39 @@
+import { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { CountryIso } from 'meta/area'
+import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
+
+import { useAppDispatch } from 'client/store'
+import { UserManagementActions } from 'client/store/ui/userManagement'
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+
+import type { Props as BaseProps } from '../../../Props'
+import { useRefetchUsers } from '../../hooks/useRefetchUsers'
+
+type Props = BaseProps & {
+  callback: () => void
+}
+
+export const useRemoveInvitation = (props: Props) => {
+  const { user, callback } = props
+
+  const { assessmentName, cycleName, countryIso } = useCountryRouteParams<CountryIso>()
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+  const refetchInvitations = useRefetchUsers()
+
+  return useCallback(() => {
+    const { fullName } = user
+    const { invitation } = CountryUserSummaries.getCountryRoleAndInvitation(user, countryIso)
+    const { uuid: invitationUuid } = invitation
+    // eslint-disable-next-line no-alert
+    if (window.confirm(t('userManagement.confirmDelete', { user: fullName }))) {
+      const params = { assessmentName, cycleName, countryIso, invitationUuid }
+      dispatch(UserManagementActions.removeInvitation(params)).then(() => {
+        refetchInvitations()
+        callback()
+      })
+    }
+  }, [user, countryIso, t, assessmentName, cycleName, dispatch, refetchInvitations, callback])
+}
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Remove/index.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Remove/index.ts
new file mode 100644
index 0000000000..0d7b50c66d
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Remove/index.ts
@@ -0,0 +1 @@
+export { default } from './Remove'
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Resend/Resend.tsx b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Resend/Resend.tsx
new file mode 100644
index 0000000000..68232843e3
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Resend/Resend.tsx
@@ -0,0 +1,37 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { CountryIso } from 'meta/area'
+import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
+
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import Button, { ButtonSize, ButtonType } from 'client/components/Buttons/Button'
+
+import { Props } from '../../Props'
+import { useResendInvitation } from '../hooks/useResendInvitation'
+
+const Information: React.FC<Props> = (props: Props) => {
+  const { user } = props
+  const { countryIso } = useCountryRouteParams<CountryIso>()
+  const { resendInvitation, isLoading } = useResendInvitation({ user })
+
+  const { t } = useTranslation()
+
+  if (!CountryUserSummaries.isInvitation(user, countryIso)) {
+    return null
+  }
+
+  return (
+    <Button
+      className="home-user-action-button-resend"
+      disabled={isLoading}
+      iconName="rotate"
+      label={t('common.inviteAgain')}
+      onClick={resendInvitation}
+      size={ButtonSize.xs}
+      type={ButtonType.primary}
+    />
+  )
+}
+
+export default Information
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Resend/index.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Resend/index.ts
new file mode 100644
index 0000000000..1aa11dce8e
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Resend/index.ts
@@ -0,0 +1 @@
+export { default } from './Resend'
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/hooks/useRefetchUsers.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/hooks/useRefetchUsers.ts
new file mode 100644
index 0000000000..571bb06251
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/hooks/useRefetchUsers.ts
@@ -0,0 +1,23 @@
+import { useCallback } from 'react'
+
+import { ApiEndPoint } from 'meta/api/endpoint'
+import { CountryIso } from 'meta/area'
+
+import { useAppDispatch } from 'client/store'
+import { TablePaginatedActions } from 'client/store/ui/tablePaginated'
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+
+export const useRefetchUsers = (): (() => void) => {
+  const { assessmentName, cycleName, countryIso } = useCountryRouteParams<CountryIso>()
+
+  const dispatch = useAppDispatch()
+
+  return useCallback(() => {
+    const limit: number = undefined
+    const page: number = undefined
+    const path = ApiEndPoint.User.many()
+
+    const getDataProps = { assessmentName, cycleName, countryIso, limit, page, path }
+    dispatch(TablePaginatedActions.getData(getDataProps))
+  }, [assessmentName, countryIso, cycleName, dispatch])
+}
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/hooks/useResendInvitation.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/hooks/useResendInvitation.ts
new file mode 100644
index 0000000000..9a36b9345f
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/hooks/useResendInvitation.ts
@@ -0,0 +1,50 @@
+import { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { CountryIso } from 'meta/area'
+import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
+
+import { useAppDispatch } from 'client/store'
+import { UserManagementActions } from 'client/store/ui/userManagement'
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import { useToaster } from 'client/hooks/useToaster'
+
+import type { Props as BaseProps } from '../../Props'
+import { useRefetchUsers } from './useRefetchUsers'
+
+type Props = BaseProps & {
+  callback?: () => void
+}
+
+type Returned = {
+  resendInvitation: () => void
+  isLoading: boolean
+}
+
+export const useResendInvitation = (props: Props): Returned => {
+  const { user, callback } = props
+  const { assessmentName, cycleName, countryIso } = useCountryRouteParams<CountryIso>()
+
+  const [isLoading, setIsLoading] = useState<boolean>(false)
+
+  const { t } = useTranslation()
+  const { toaster } = useToaster()
+
+  const dispatch = useAppDispatch()
+  const refetchUsers = useRefetchUsers()
+
+  const resendInvitation = useCallback(() => {
+    setIsLoading(true)
+    const { invitation } = CountryUserSummaries.getCountryRoleAndInvitation(user, countryIso)
+    const { uuid: invitationUuid } = invitation
+    const params = { assessmentName, countryIso, cycleName, invitationUuid }
+    dispatch(UserManagementActions.sendInvitationEmail(params)).then(() => {
+      refetchUsers()
+      toaster.success(t('userManagement.invitationEmailSent'))
+      setIsLoading(false)
+      callback?.()
+    })
+  }, [user, countryIso, assessmentName, cycleName, dispatch, refetchUsers, toaster, t, callback])
+
+  return { resendInvitation, isLoading }
+}
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/index.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/index.ts
new file mode 100644
index 0000000000..1848414d1f
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/index.ts
@@ -0,0 +1 @@
+export { default } from './Actions'
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/useActions.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/useActions.ts
new file mode 100644
index 0000000000..150ac390ce
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/useActions.ts
@@ -0,0 +1,81 @@
+import React, { useMemo } from 'react'
+
+import { CountryIso } from 'meta/area'
+import { Authorizer, UserInvitations, Users } from 'meta/user'
+import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
+
+import { useCycle } from 'client/store/assessment'
+import { useCanSeeUserActivities, useUser } from 'client/store/user'
+import { useCanEditUserActivities } from 'client/store/user/hooks'
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+
+import { Props } from '../Props'
+import CopyLink from './CopyLink'
+import Edit from './Edit'
+import Message from './Message'
+import Remove from './Remove'
+import Resend from './Resend'
+
+type ActionType = {
+  Component: React.FC<Props>
+  name: string
+}
+
+export const useActions = (props: Props): Array<ActionType> => {
+  const { user } = props
+
+  const { countryIso } = useCountryRouteParams<CountryIso>()
+  const cycle = useCycle()
+  const currentUser = useUser()
+  const canCurrentUserEditActivities = useCanEditUserActivities(currentUser)
+  const canCurrentUserViewActivities = useCanSeeUserActivities(currentUser)
+  const canTargetUserViewActivities = useCanSeeUserActivities(user)
+
+  const { invitation } = CountryUserSummaries.getCountryRoleAndInvitation(user, countryIso)
+  const isInvitation = CountryUserSummaries.isInvitation(user, countryIso)
+  const expired = invitation && UserInvitations.isExpired(invitation)
+
+  return useMemo<Array<ActionType>>(() => {
+    // List of actions available to the user
+    const actions: Array<ActionType> = []
+
+    // Reviewer cannot access invitation actions
+    if (isInvitation && canCurrentUserEditActivities) {
+      actions.push({ name: 'resend', Component: Resend })
+      // Allow copying the link only when the invitation is not expired
+      if (!expired) {
+        actions.push({ name: 'copy', Component: CopyLink })
+      }
+      actions.push({ name: 'remove', Component: Remove })
+    }
+
+    if (!isInvitation) {
+      // If the user or target cannot send/receive messages, hide message button
+      const canSendOrReceiveMessage = canCurrentUserViewActivities && canTargetUserViewActivities
+      // If viewing self, return hide message button
+      const isSelf = user.uuid === currentUser.uuid
+
+      if (canSendOrReceiveMessage && !isSelf) {
+        actions.push({ name: 'message', Component: Message })
+      }
+
+      if (
+        Authorizer.canEditUser({ countryIso, cycle, user: currentUser, target: user }) ||
+        Users.isReviewer(currentUser, countryIso, cycle)
+      ) {
+        actions.push({ name: 'edit', Component: Edit })
+      }
+    }
+    return actions
+  }, [
+    canCurrentUserEditActivities,
+    canCurrentUserViewActivities,
+    canTargetUserViewActivities,
+    countryIso,
+    currentUser,
+    cycle,
+    expired,
+    isInvitation,
+    user,
+  ])
+}
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Info/Info.scss b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Info/Info.scss
new file mode 100644
index 0000000000..ec5df203b6
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Info/Info.scss
@@ -0,0 +1,44 @@
+@import 'src/client/style/partials';
+
+.home-user-info {
+  &.expired {
+    .home-user-name .name {
+      text-decoration: line-through;
+    }
+  }
+}
+
+.home-user-name {
+  align-items: center;
+  display: flex;
+  gap: 8px;
+
+  .name {
+    font-weight: 700;
+  }
+}
+
+// TODO: Introduce common component Badge
+.invitation-badge {
+  align-items: center;
+  background-color: rgba($ui-alert, 0.2);
+  border-radius: 4px;
+  border: 1px solid rgba($ui-alert, 0.8);
+  color: darken($ui-alert, 20%);
+  display: grid;
+  font-size: 8px;
+  font-weight: 600;
+  height: 16px;
+  justify-content: center;
+  letter-spacing: 0.4px;
+  line-height: 0;
+  padding: 0 8px;
+  text-transform: uppercase;
+  transition: all 0.2s;
+
+  &.expired {
+    border: 1px solid rgba($ui-destructive, 0.8);
+    background-color: rgba($ui-destructive, 0.2);
+    color: darken($ui-destructive, 15%);
+  }
+}
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Info/Info.tsx b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Info/Info.tsx
new file mode 100644
index 0000000000..bc2a7ffd1c
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Info/Info.tsx
@@ -0,0 +1,39 @@
+import './Info.scss'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+
+import classNames from 'classnames'
+
+import { CountryIso } from 'meta/area'
+import { UserInvitations } from 'meta/user'
+import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
+
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+
+import type { Props } from '../Props'
+
+const Info: React.FC<Props> = (props: Props) => {
+  const { user } = props
+  const { t } = useTranslation()
+  const { countryIso } = useCountryRouteParams<CountryIso>()
+
+  const { invitation } = CountryUserSummaries.getCountryRoleAndInvitation(user, countryIso)
+  const isInvitation = CountryUserSummaries.isInvitation(user, countryIso)
+  const expired = invitation && UserInvitations.isExpired(invitation)
+
+  return (
+    <div className={classNames('home-user-info', { expired })}>
+      <div className="home-user-name">
+        <div className="name">{user.fullName}</div>
+
+        {isInvitation && (
+          <div className={classNames('invitation-badge', { expired })}>
+            {expired ? t('common.expired') : t('common.pending')}
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
+
+export default Info
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Info/index.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Info/index.ts
new file mode 100644
index 0000000000..bc0660155d
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Info/index.ts
@@ -0,0 +1 @@
+export { default } from './Info'
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Props.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Props.ts
new file mode 100644
index 0000000000..fd358856e3
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Props.ts
@@ -0,0 +1,5 @@
+import { CountryUserSummary } from 'meta/user'
+
+export type Props = {
+  user: CountryUserSummary
+}
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/UserCard.scss b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/UserCard.scss
new file mode 100644
index 0000000000..3248337761
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/UserCard.scss
@@ -0,0 +1,39 @@
+@import 'src/client/style/partials';
+
+.home-user-card {
+  align-content: center;
+  display: grid;
+  grid-column-gap: $spacing-xxxs;
+  grid-row-gap: $spacing-xxxxs;
+  grid-template-columns: auto auto;
+  justify-content: start;
+  padding: $spacing-xxs;
+  background-color: $ui-bg-light;
+  transition: background-color 0.2s ease;
+
+  .user-avatar {
+    align-self: center;
+    grid-row: span 2;
+  }
+
+  &.invitation {
+    .user-avatar,
+    .home-user-name .name {
+      opacity: 0.6;
+    }
+  }
+
+  // Hide all buttons but not message button
+  [class*='home-user-action-button-']:not([class*='home-user-action-button-message']) {
+    opacity: 0;
+    transition: all 0.2s ease;
+  }
+
+  &:hover {
+    background-color: darken($ui-bg-light, 2%);
+
+    [class*='home-user-action-button-']:not([class*='home-user-action-button-message']) {
+      opacity: 1;
+    }
+  }
+}
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/UserCard.tsx b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/UserCard.tsx
new file mode 100644
index 0000000000..39ea15143f
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/UserCard.tsx
@@ -0,0 +1,34 @@
+import './UserCard.scss'
+import React from 'react'
+
+import classNames from 'classnames'
+
+import { CountryIso } from 'meta/area'
+import { UserInvitations } from 'meta/user'
+import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
+
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import Avatar from 'client/components/Avatar'
+
+import Actions from './Actions'
+import Info from './Info'
+import { Props } from './Props'
+
+const UserCard: React.FC<Props> = (props) => {
+  const { user } = props
+  const { countryIso } = useCountryRouteParams<CountryIso>()
+  const { invitation: _invitation } = CountryUserSummaries.getCountryRoleAndInvitation(user, countryIso)
+
+  const invitation = CountryUserSummaries.isInvitation(user, countryIso)
+  const expired = invitation && UserInvitations.isExpired(_invitation)
+
+  return (
+    <div className={classNames('home-user-card', { invitation, expired })}>
+      <Avatar user={user} />
+      <Info user={user} />
+      <Actions user={user} />
+    </div>
+  )
+}
+
+export default UserCard
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/index.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/index.ts
new file mode 100644
index 0000000000..3d822043ac
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/index.ts
@@ -0,0 +1 @@
+export { default } from './UserCard'
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserList.scss b/src/client/pages/CountryHome/Collaborators/UserList/UserList.scss
new file mode 100644
index 0000000000..3c91dff28b
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserList.scss
@@ -0,0 +1,16 @@
+@import 'src/client/style/partials';
+
+.country-home__user-list {
+  display: grid;
+  padding-top: $spacing-xs;
+
+  .btn-invite {
+    justify-self: end;
+  }
+
+  .table-paginated-datagrid {
+    .data-grid-column {
+      padding: unset;
+    }
+  }
+}
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserList.tsx b/src/client/pages/CountryHome/Collaborators/UserList/UserList.tsx
new file mode 100644
index 0000000000..9fece93b25
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserList.tsx
@@ -0,0 +1,46 @@
+import './UserList.scss'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { ApiEndPoint } from 'meta/api/endpoint'
+import { CountryIso } from 'meta/area'
+import { CountryUserSummary } from 'meta/user'
+import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
+
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import TablePaginated from 'client/components/TablePaginated'
+
+import { useColumns } from './hooks/useColumns'
+import { useUserCompareFn } from './hooks/useUserCompareFn'
+import Invite from './Invite'
+
+const counter = { show: false }
+const header = false
+const path = ApiEndPoint.User.many()
+
+const UserList: React.FC = () => {
+  const { t } = useTranslation()
+  const { countryIso } = useCountryRouteParams<CountryIso>()
+  const columns = useColumns()
+  const compareFn = useUserCompareFn()
+
+  return (
+    <div className="country-home__user-list">
+      <Invite />
+
+      <TablePaginated
+        columns={columns}
+        compareFn={compareFn}
+        counter={counter}
+        groups={{
+          headerLabel: (roleName) => t(`user.roles.${roleName.toString()}`, { count: 2 }),
+          keySelector: (user: CountryUserSummary) => CountryUserSummaries.getRoleName(user, countryIso),
+        }}
+        header={header}
+        path={path}
+      />
+    </div>
+  )
+}
+
+export default UserList
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/hooks/useColumns.tsx b/src/client/pages/CountryHome/Collaborators/UserList/hooks/useColumns.tsx
new file mode 100644
index 0000000000..cb329d492c
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/hooks/useColumns.tsx
@@ -0,0 +1,20 @@
+import React, { useMemo } from 'react'
+
+import { CountryUserSummary } from 'meta/user'
+
+import { Column } from 'client/components/TablePaginated'
+
+import UserCard from '../UserCard'
+
+export const useColumns = (): Array<Column<CountryUserSummary>> => {
+  return useMemo<Array<Column<CountryUserSummary>>>(
+    () => [
+      {
+        header: '',
+        key: 'info',
+        component: ({ datum }) => <UserCard user={datum} />,
+      },
+    ],
+    []
+  )
+}
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/hooks/useUserCompareFn.ts b/src/client/pages/CountryHome/Collaborators/UserList/hooks/useUserCompareFn.ts
new file mode 100644
index 0000000000..a1aa3cb16a
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/hooks/useUserCompareFn.ts
@@ -0,0 +1,35 @@
+import { useCallback } from 'react'
+
+import { CountryIso } from 'meta/area'
+import { TablePaginatedCompareFn } from 'meta/tablePaginated'
+import { CountryUserSummary, RoleName } from 'meta/user'
+import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
+
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+
+const ranks: Record<RoleName, number> = {
+  [RoleName.ADMINISTRATOR]: 5,
+  [RoleName.REVIEWER]: 4,
+  [RoleName.NATIONAL_CORRESPONDENT]: 3,
+  [RoleName.ALTERNATE_NATIONAL_CORRESPONDENT]: 2,
+  [RoleName.COLLABORATOR]: 1,
+  [RoleName.VIEWER]: 0,
+}
+
+export const useUserCompareFn = (): TablePaginatedCompareFn<CountryUserSummary> => {
+  const { countryIso } = useCountryRouteParams<CountryIso>()
+
+  return useCallback<TablePaginatedCompareFn<CountryUserSummary>>(
+    (a: CountryUserSummary, b: CountryUserSummary) => {
+      const isInvitationA = CountryUserSummaries.isInvitation(a, countryIso)
+      const isInvitationB = CountryUserSummaries.isInvitation(b, countryIso)
+      if (isInvitationA && !isInvitationB) return 1
+      if (!isInvitationA && isInvitationB) return -1
+
+      const rankA = ranks[CountryUserSummaries.getRoleName(a, countryIso)]
+      const rankB = ranks[CountryUserSummaries.getRoleName(b, countryIso)]
+      return rankB - rankA
+    },
+    [countryIso]
+  )
+}
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/index.ts b/src/client/pages/CountryHome/Collaborators/UserList/index.ts
new file mode 100644
index 0000000000..9a862bc697
--- /dev/null
+++ b/src/client/pages/CountryHome/Collaborators/UserList/index.ts
@@ -0,0 +1 @@
+export { default } from './UserList'
diff --git a/src/client/pages/CountryHome/FraHome/Collaborators/index.ts b/src/client/pages/CountryHome/Collaborators/index.ts
similarity index 100%
rename from src/client/pages/CountryHome/FraHome/Collaborators/index.ts
rename to src/client/pages/CountryHome/Collaborators/index.ts
diff --git a/src/client/pages/CountryHome/CountryHeader/ButtonDownloadDashboard/ButtonDownloadDashboard.tsx b/src/client/pages/CountryHome/CountryHeader/ButtonDownloadDashboard/ButtonDownloadDashboard.tsx
new file mode 100644
index 0000000000..d4a240c69f
--- /dev/null
+++ b/src/client/pages/CountryHome/CountryHeader/ButtonDownloadDashboard/ButtonDownloadDashboard.tsx
@@ -0,0 +1,45 @@
+import React, { useMemo } from 'react'
+import { Link, matchPath, useLocation } from 'react-router-dom'
+
+import { ApiEndPoint } from 'meta/api/endpoint'
+import { Areas } from 'meta/area'
+import { Routes, SectionNames } from 'meta/routes'
+
+import { useLanguage } from 'client/hooks/useLanguage'
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import { ButtonSize, useButtonClassName } from 'client/components/Buttons/Button'
+import Icon from 'client/components/Icon'
+
+const sectionName = SectionNames.Country.Home.overview
+
+const ButtonDownloadDashboard: React.FC = () => {
+  const { pathname } = useLocation()
+
+  const { assessmentName, cycleName, countryIso } = useCountryRouteParams()
+  const lang = useLanguage()
+  const className = useButtonClassName({ iconName: 'icon-hit-down', label: 'L', size: ButtonSize.s })
+
+  const to = useMemo<string>(() => {
+    const searchParams = new URLSearchParams({ assessmentName, cycleName, countryIso, lang })
+    return `${ApiEndPoint.File.dashboard()}?${searchParams.toString()}`
+  }, [assessmentName, countryIso, cycleName, lang])
+
+  const renderButton = useMemo<boolean>(() => {
+    const overviewPath = Routes.CountryHomeSection.generatePath({ assessmentName, cycleName, countryIso, sectionName })
+    const matchOverview = matchPath({ path: overviewPath, end: true }, pathname)
+    return matchOverview && (Areas.isGlobal(countryIso) || Areas.isFRARegion(countryIso))
+  }, [assessmentName, countryIso, cycleName, pathname])
+
+  if (!renderButton) {
+    return null
+  }
+
+  return (
+    <Link className={className} target="_top" to={to}>
+      <Icon className="icon-hit-down icon-white" name="hit-down" />
+      <Icon className="icon-no-margin icon-white" name="icon-table2" />
+    </Link>
+  )
+}
+
+export default ButtonDownloadDashboard
diff --git a/src/client/pages/CountryHome/FraHome/ButtonDownloadDashboard/index.ts b/src/client/pages/CountryHome/CountryHeader/ButtonDownloadDashboard/index.ts
similarity index 100%
rename from src/client/pages/CountryHome/FraHome/ButtonDownloadDashboard/index.ts
rename to src/client/pages/CountryHome/CountryHeader/ButtonDownloadDashboard/index.ts
diff --git a/src/client/pages/CountryHome/CountryHeader/CountryHeader.scss b/src/client/pages/CountryHome/CountryHeader/CountryHeader.scss
new file mode 100644
index 0000000000..ac2fa760c1
--- /dev/null
+++ b/src/client/pages/CountryHome/CountryHeader/CountryHeader.scss
@@ -0,0 +1,43 @@
+@import 'src/client/style/partials';
+
+.country-header {
+  align-items: center;
+  display: grid;
+  justify-content: start;
+  width: 100%;
+
+  &.withTabs {
+    grid-column-gap: $spacing-s;
+    grid-template-columns: repeat(2, auto);
+
+    &.withMessageBoard {
+      grid-template-columns: repeat(3, auto);
+    }
+  }
+}
+
+.country-header__label {
+  align-items: center;
+  display: flex;
+  gap: 8px;
+}
+
+.country-header__tabs {
+  align-items: center;
+  display: flex;
+  gap: 8px;
+  height: 100%;
+  border: 1px solid $ui-border;
+  padding: 2px;
+  border-radius: 2px;
+  background-color: $ui-bg;
+
+  a.button__type-black.inverse {
+    background-color: $ui-bg;
+    color: lighten($ui-black-map, 30%);
+
+    &:hover {
+      background-color: $ui-bg-hover;
+    }
+  }
+}
diff --git a/src/client/pages/CountryHome/CountryHeader/CountryHeader.tsx b/src/client/pages/CountryHome/CountryHeader/CountryHeader.tsx
new file mode 100644
index 0000000000..b3637e95bf
--- /dev/null
+++ b/src/client/pages/CountryHome/CountryHeader/CountryHeader.tsx
@@ -0,0 +1,97 @@
+import './CountryHeader.scss'
+import React, { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import { NavLink } from 'react-router-dom'
+
+import classNames from 'classnames'
+
+import { Areas } from 'meta/area'
+import { MessageTopicType, Topics } from 'meta/messageCenter'
+
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import { ButtonSize, ButtonType, useButtonClassName } from 'client/components/Buttons/Button'
+import MessageButton from 'client/pages/CountryHome/MessageButton'
+import { CountryHomeSection } from 'client/pages/CountryHome/types'
+
+import { useShowCountryMessageButton } from './hooks/useShowCountryMessageButton'
+import ButtonDownloadDashboard from './ButtonDownloadDashboard'
+import CountrySelector from './CountrySelector'
+import SelectedCountries from './SelectedCountries'
+
+type Props = {
+  sections: Array<CountryHomeSection>
+  showRegionLabel?: boolean
+}
+
+const size = ButtonSize.m
+const noBorder = true
+
+const CountryHeader: React.FC<Props> = (props) => {
+  const { sections, showRegionLabel } = props
+
+  const { t } = useTranslation()
+  const { countryIso } = useCountryRouteParams()
+  const withMessageBoard = useShowCountryMessageButton()
+  const sectionClassName = useButtonClassName({ inverse: true, label: 'L', noBorder, size, type: ButtonType.black })
+  const sectionActiveClassName = useButtonClassName({ label: 'L', noBorder, size, type: ButtonType.primary })
+
+  const withLabel = useMemo<boolean>(
+    () => Areas.isISOCountry(countryIso) || showRegionLabel,
+    [countryIso, showRegionLabel]
+  )
+
+  const withTabs = useMemo<boolean>(
+    () => Areas.isISOCountry(countryIso) && sections?.length > 1,
+    [countryIso, sections]
+  )
+
+  return (
+    <div className={classNames('country-header', { withMessageBoard, withTabs })}>
+      {withLabel && (
+        <div className="country-header__label">
+          <h1 className="title">{t(`area.${countryIso}.listName`)}</h1>
+          <ButtonDownloadDashboard />
+          {Areas.isISOGlobal(countryIso) && <CountrySelector />}
+        </div>
+      )}
+
+      {Areas.isISOGlobal(countryIso) && <SelectedCountries />}
+
+      {withTabs && (
+        <div className="country-header__tabs">
+          {sections.map(({ name }, index) => (
+            <React.Fragment key={name}>
+              {index !== 0 && <div className="toolbar__separator" />}
+              <NavLink
+                key={name}
+                className={({ isActive }) => (isActive ? sectionActiveClassName : sectionClassName)}
+                to={name}
+              >
+                {t(`landing.sections.${name}`)}
+              </NavLink>
+            </React.Fragment>
+          ))}
+        </div>
+      )}
+
+      {withMessageBoard && (
+        <MessageButton
+          inverse
+          label={t('landing.sections.messageBoard')}
+          size={ButtonSize.m}
+          topic={{
+            key: Topics.getMessageBoardCountryKey(),
+            title: t(Areas.getTranslationKey(countryIso)),
+            type: MessageTopicType.messageBoard,
+          }}
+        />
+      )}
+    </div>
+  )
+}
+
+CountryHeader.defaultProps = {
+  showRegionLabel: true,
+}
+
+export default CountryHeader
diff --git a/src/client/pages/CountryHome/FraHome/CountrySelector/CountrySelector.tsx b/src/client/pages/CountryHome/CountryHeader/CountrySelector/CountrySelector.tsx
similarity index 81%
rename from src/client/pages/CountryHome/FraHome/CountrySelector/CountrySelector.tsx
rename to src/client/pages/CountryHome/CountryHeader/CountrySelector/CountrySelector.tsx
index dbf2556e27..9057fe5a67 100644
--- a/src/client/pages/CountryHome/FraHome/CountrySelector/CountrySelector.tsx
+++ b/src/client/pages/CountryHome/CountryHeader/CountrySelector/CountrySelector.tsx
@@ -9,13 +9,14 @@ import { useAppDispatch } from 'client/store'
 import { useCountries, useSecondaryRegion } from 'client/store/area'
 import { useHomeCountriesFilter } from 'client/store/ui/home'
 import { HomeActions } from 'client/store/ui/home/slice'
+import Button, { ButtonSize } from 'client/components/Buttons/Button'
 import CountrySelectModal from 'client/components/CountrySelectModal'
 
 const __MIN_COUNTRIES__ = 9
 
 const CountrySelector: React.FC = () => {
   const dispatch = useAppDispatch()
-  const i18n = useTranslation()
+  const { t } = useTranslation()
   const countries = useCountries()
   const secondaryRegions = useSecondaryRegion()
 
@@ -38,18 +39,22 @@ const CountrySelector: React.FC = () => {
   return (
     <div className="country-selector">
       <CountrySelectModal
+        canSave={canSave}
         countries={countries}
+        excludedRegions={[RegionCode.FE, ...secondaryRegions.regions.map((r: Region) => r.regionCode)]}
+        headerLabel={t('common.select')}
         initialSelection={countriesFilter}
-        open={modalOpen}
-        headerLabel={i18n.t<string>('common.select')}
         onClose={onClose}
-        canSave={canSave}
-        excludedRegions={[RegionCode.FE, ...secondaryRegions.regions.map((r: Region) => r.regionCode)]}
+        open={modalOpen}
         showCount
       />
-      <button onClick={() => setModalOpen(true)} className="btn-s btn btn-primary filter-countries" type="button">
-        {i18n.t<string>('common.filterCountries')}
-      </button>
+      <Button
+        iconName="filter"
+        inverse={Objects.isEmpty(countriesFilter)}
+        label={t('common.filterCountries')}
+        onClick={() => setModalOpen(true)}
+        size={ButtonSize.s}
+      />
     </div>
   )
 }
diff --git a/src/client/pages/CountryHome/FraHome/CountrySelector/index.ts b/src/client/pages/CountryHome/CountryHeader/CountrySelector/index.ts
similarity index 100%
rename from src/client/pages/CountryHome/FraHome/CountrySelector/index.ts
rename to src/client/pages/CountryHome/CountryHeader/CountrySelector/index.ts
diff --git a/src/client/pages/CountryHome/FraHome/SelectedCountries/SelectedCountries.tsx b/src/client/pages/CountryHome/CountryHeader/SelectedCountries/SelectedCountries.tsx
similarity index 97%
rename from src/client/pages/CountryHome/FraHome/SelectedCountries/SelectedCountries.tsx
rename to src/client/pages/CountryHome/CountryHeader/SelectedCountries/SelectedCountries.tsx
index 29a95d6648..2cdddad5e3 100644
--- a/src/client/pages/CountryHome/FraHome/SelectedCountries/SelectedCountries.tsx
+++ b/src/client/pages/CountryHome/CountryHeader/SelectedCountries/SelectedCountries.tsx
@@ -16,13 +16,13 @@ const SelectedCountries: React.FC = () => {
   }
 
   return (
-    <>
+    <div>
       {countriesFilter.map((countryIso: CountryIso) => (
         <span key={countryIso} className="landng__page-country-label">
           {i18n.t<string>(Areas.getTranslationKey(countryIso))}
         </span>
       ))}
-    </>
+    </div>
   )
 }
 
diff --git a/src/client/pages/CountryHome/FraHome/SelectedCountries/index.ts b/src/client/pages/CountryHome/CountryHeader/SelectedCountries/index.ts
similarity index 100%
rename from src/client/pages/CountryHome/FraHome/SelectedCountries/index.ts
rename to src/client/pages/CountryHome/CountryHeader/SelectedCountries/index.ts
diff --git a/src/client/pages/CountryHome/CountryHeader/hooks/useShowCountryMessageButton.ts b/src/client/pages/CountryHome/CountryHeader/hooks/useShowCountryMessageButton.ts
new file mode 100644
index 0000000000..54f5b8e0d9
--- /dev/null
+++ b/src/client/pages/CountryHome/CountryHeader/hooks/useShowCountryMessageButton.ts
@@ -0,0 +1,13 @@
+import { Areas } from 'meta/area'
+
+import { useCanSeeUserActivities, useUser } from 'client/store/user'
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+
+export const useShowCountryMessageButton = (): boolean => {
+  const user = useUser()
+  const canSeeUserActivities = useCanSeeUserActivities(user)
+
+  const { countryIso } = useCountryRouteParams()
+
+  return Areas.isISOCountry(countryIso) && canSeeUserActivities
+}
diff --git a/src/client/pages/CountryHome/CountryHeader/index.ts b/src/client/pages/CountryHome/CountryHeader/index.ts
new file mode 100644
index 0000000000..c626f5277b
--- /dev/null
+++ b/src/client/pages/CountryHome/CountryHeader/index.ts
@@ -0,0 +1 @@
+export { default } from './CountryHeader'
diff --git a/src/client/pages/CountryHome/CountryHome.scss b/src/client/pages/CountryHome/CountryHome.scss
index 4f4164eccb..4f6b8ec4a2 100644
--- a/src/client/pages/CountryHome/CountryHome.scss
+++ b/src/client/pages/CountryHome/CountryHome.scss
@@ -7,46 +7,12 @@
   list-style: none;
   display: flex;
   align-items: center;
-
-  .space-between {
-    justify-content: space-between;
-  }
 }
 
 .landing__page-title {
-  display: flex;
-  align-items: center;
-  flex: 1;
-}
-
-.landing__page-menu {
-  display: flex;
-  padding-top: 9px;
-  align-items: start;
-  overflow-x: auto;
-}
-
-a.landing__page-menu-button {
-  border-radius: unset;
-  font-size: $font-l;
-  font-weight: normal;
-  margin: 0;
-  color: $text-body;
-  border-top: unset;
-  border-right: unset;
-  border-left: unset;
-  border-bottom: 2px solid $ui-border;
-
-  &:hover {
-    color: $ui-accent;
-  }
-
-  &.disabled,
-  &:disabled {
-    border-bottom-color: $ui-accent;
-    color: $ui-accent;
-    opacity: 1;
-  }
+  display: grid;
+  grid-template-columns: repeat(2, auto);
+  grid-column-gap: $spacing-xxs;
 }
 
 // TODO: uncomment lines below if needed, or add the style in the Component if applicable
@@ -60,281 +26,3 @@ a.landing__page-menu-button {
   margin: 5px 2.5px 0;
   font-size: $font-s;
 }
-//
-//.landing__page-container {
-//  display: flex;
-//  flex-wrap: wrap;
-//  justify-content: center;
-//}
-//
-//.landing__page-container-header {
-//  margin-bottom: 12px;
-//  width: 100%;
-//  text-align: center;
-//}
-//
-//.landing__page-container-item {
-//  width: 50%;
-//  padding: 8px;
-//}
-//
-////Milestones
-//.landing__milestones-container {
-//  @extend .landing__page-container;
-//  width: 100%;
-//}
-//
-//.landing__milestones-content {
-//  display: flex;
-//  width: 100%;
-//}
-//
-//.landing__milestone-group-item {
-//  display: flex;
-//  flex-direction: column;
-//  flex: 1;
-//  padding: 0 8px;
-//}
-//
-//.landing__milestone-group-year {
-//  font-size: $font-m;
-//  font-weight: bold;
-//  text-align: center;
-//}
-//
-//.landing__milestone-item {
-//  padding: 14px 10px;
-//  border: 1px solid $ui-border-light;
-//  background-color: lighten($ui-bg, 1%);
-//  margin-top: 12px;
-//}
-//
-//.landing__milestone-item-date {
-//  margin-bottom: 5px;
-//  text-transform: uppercase;
-//  font-size: $font-xxs;
-//  color: lighten($text-mute, 10%);
-//  text-align: center;
-//  font-weight: bold;
-//}
-//
-//.landing__milestone-item-desc {
-//  text-align: center;
-//}
-//
-
-////Logos
-//.landing__logos-container {
-//  padding: 32px 0;
-//}
-//
-//.landing__logos-inner-container {
-//  padding: 8px;
-//  width: 100%;
-//  text-align: center;
-//  display: flex;
-//  align-items: center;
-//  justify-content: center;
-//}
-//
-//.landing__logos {
-//  max-width: 40%;
-//}
-//
-//.landing__logos__nicfi {
-//  margin-top: 5px;
-//  margin-left: 15px;
-//  max-width: 10%;
-//}
-//
-//// About
-//
-//.landing__about-text {
-//  line-height: 1.75;
-//  margin-bottom: 24px;
-//}
-//
-//// Recent Activity
-//
-//.landing__activity-item {
-//  display: flex;
-//  align-items: center;
-//  justify-content: space-between;
-//  padding: 10px 0;
-//  margin: 0 8px;
-//  word-break: break-word;
-//  width: 100%;
-//
-//  .link.disabled {
-//    color: $text-body;
-//    pointer-events: none;
-//  }
-//}
-//
-//.landing__activity-item:not(:first-of-type) {
-//  border-top: 1px solid $ui-border-light;
-//}
-//
-//.landing__activity-avatar {
-//  flex-shrink: 0;
-//  border-radius: 100%;
-//  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-//  height: 28px;
-//  width: 28px;
-//  margin-right: 12px;
-//}
-//
-//.landing__activity-name {
-//  span,
-//  strong {
-//    margin-right: 4px;
-//  }
-//}
-//
-//.landing__activity-time {
-//  color: $text-mute;
-//  font-size: $font-s;
-//  margin-left: auto;
-//  white-space: nowrap;
-//}
-//
-//.landing__activity-empty {
-//  color: $text-disabled;
-//  padding: 48px;
-//  text-align: center;
-//}
-//
-//.landing__activity-empty-title {
-//  color: $text-body;
-//  font-weight: 700;
-//  margin-top: 20px;
-//}
-//
-//// Links
-//
-//.landing__link-container {
-//  padding: 20px 40px;
-//  border: 1px solid $ui-border-light;
-//  background-color: #f8f8f8;
-//  margin: 12px 1%;
-//  flex: 0 1 31%;
-//  display: flex;
-//  align-items: center;
-//  justify-content: center;
-//  position: relative;
-//
-//  a {
-//    background-color: transparent;
-//    line-height: 20px;
-//    text-align: center;
-//    text-decoration: none;
-//    transition: all 0.1s ease-out;
-//    font-weight: bold;
-//    color: $text-mute;
-//
-//    &:hover {
-//      color: $ui-accent;
-//    }
-//  }
-//}
-//
-//.landing__btn-remove-file {
-//  position: absolute;
-//  top: 0;
-//  right: 0;
-//  background-color: transparent;
-//  padding: 4px;
-//  border-color: $ui-border-light;
-//  border-top: none !important;
-//  border-right: none !important;
-//  border-radius: 0 !important;
-//  margin: 0;
-//
-//  &:hover {
-//    background-color: rgba(208, 2, 27, 0.1);
-//  }
-//}
-//
-//.landing__repository-header {
-//  @extend .landing__page-container-header;
-//  margin-top: 24px;
-//  display: flex;
-//  justify-content: center;
-//  align-items: center;
-//
-//  button {
-//    margin-left: 12px;
-//  }
-//}
-//
-//// Table
-//
-//.landing__table {
-//  border-collapse: collapse;
-//  line-height: 20px;
-//  width: 100%;
-//
-//  td,
-//  th {
-//    padding: 10px 20px 10px 0;
-//    text-align: left;
-//    vertical-align: top;
-//
-//    &:last-child {
-//      padding-right: 0;
-//    }
-//  }
-//
-//  th {
-//    font-size: $font-l;
-//    color: $text-heading;
-//  }
-//
-//  td {
-//    font-size: $font-m;
-//    border-top: 1px solid $ui-border-light;
-//  }
-//}
-//
-//// List
-//
-//.landing__list {
-//  list-style: none;
-//  margin: 0 0 24px 0;
-//  padding: 0;
-//}
-//
-//.landing__list-heading {
-//  margin-bottom: 12px;
-//}
-//
-//.landing__list-item {
-//  margin: 4px 0;
-//}
-//
-//.landing__list-item-year {
-//  margin-right: 16px;
-//  font-weight: 700;
-//}
-//
-//// Block
-//
-//.landing__block {
-//  p {
-//    margin: 12px 0;
-//  }
-//}
-//
-//.landing__block-heading {
-//  margin-bottom: 12px;
-//}
-//
-//// Misc
-//
-//.landing__version {
-//  color: $text-disabled;
-//  font-size: $font-xs;
-//  margin-top: 32px;
-//  width: 100%;
-//  text-align: center;
-//}
diff --git a/src/client/pages/CountryHome/FraHome/ButtonDownloadDashboard/ButtonDownloadDashboard.scss b/src/client/pages/CountryHome/FraHome/ButtonDownloadDashboard/ButtonDownloadDashboard.scss
deleted file mode 100644
index 255c9a7803..0000000000
--- a/src/client/pages/CountryHome/FraHome/ButtonDownloadDashboard/ButtonDownloadDashboard.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-@import 'src/client/style/partials';
-
-.landing__btn-download {
-  margin-left: 12px;
-  display: flex;
-  align-items: center;
-  padding: $spacing-xxxs $spacing-xxs;
-
-  .icon-hit-down {
-    width: 14px;
-    height: 13px;
-  }
-}
diff --git a/src/client/pages/CountryHome/FraHome/ButtonDownloadDashboard/ButtonDownloadDashboard.tsx b/src/client/pages/CountryHome/FraHome/ButtonDownloadDashboard/ButtonDownloadDashboard.tsx
deleted file mode 100644
index 2948090e36..0000000000
--- a/src/client/pages/CountryHome/FraHome/ButtonDownloadDashboard/ButtonDownloadDashboard.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import './ButtonDownloadDashboard.scss'
-import React from 'react'
-import { Link, matchPath, useLocation } from 'react-router-dom'
-
-import { ApiEndPoint } from 'meta/api/endpoint'
-import { Areas } from 'meta/area'
-import { Routes, SectionNames } from 'meta/routes'
-
-import { useLanguage } from 'client/hooks/useLanguage'
-import { useCountryRouteParams } from 'client/hooks/useRouteParams'
-import Icon from 'client/components/Icon'
-
-const ButtonDownloadDashboard: React.FC = () => {
-  const { pathname } = useLocation()
-
-  const { assessmentName, cycleName, countryIso } = useCountryRouteParams()
-  const lang = useLanguage()
-  const sectionName = SectionNames.Country.Home.overview
-  const overviewPath = Routes.CountryHomeSection.generatePath({ assessmentName, cycleName, countryIso, sectionName })
-
-  const matchOverview = matchPath({ path: overviewPath, end: true }, pathname)
-  const renderButton = matchOverview && (Areas.isGlobal(countryIso) || Areas.isFRARegion(countryIso))
-
-  if (!renderButton) {
-    return null
-  }
-
-  return (
-    <Link
-      className="btn-s btn-primary landing__btn-download"
-      to={`${ApiEndPoint.File.dashboard()}?assessmentName=${assessmentName}&countryIso=${countryIso}&cycleName=${cycleName}&lang=${lang}`}
-      target="_top"
-    >
-      <Icon name="hit-down" className="icon-hit-down icon-white" />
-      <Icon name="icon-table2" className="icon-no-margin icon-white" />
-    </Link>
-  )
-}
-
-export default ButtonDownloadDashboard
diff --git a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/CountryMessageBoard.scss b/src/client/pages/CountryHome/FraHome/CountryMessageBoard/CountryMessageBoard.scss
deleted file mode 100644
index 3dd15e05d3..0000000000
--- a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/CountryMessageBoard.scss
+++ /dev/null
@@ -1,155 +0,0 @@
-@import 'src/client/style/partials';
-
-.landing__page-container {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-}
-
-.landing__page-container-header {
-  margin-bottom: 12px;
-  width: 100%;
-  text-align: center;
-}
-
-.landing__page-container-item {
-  width: 50%;
-  padding: 8px;
-}
-
-//Milestones
-.landing__milestones-container {
-  @extend .landing__page-container;
-  width: 100%;
-}
-
-.landing__milestones-content {
-  display: flex;
-  width: 100%;
-}
-
-.landing__milestone-group-item {
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-  padding: 0 8px;
-}
-
-.landing__milestone-group-year {
-  font-size: $font-m;
-  font-weight: bold;
-  text-align: center;
-}
-
-.landing__milestone-item {
-  padding: 14px 10px;
-  border: 1px solid $ui-border-light;
-  background-color: lighten($ui-bg, 1%);
-  margin-top: 12px;
-}
-
-.landing__milestone-item-date {
-  margin-bottom: 5px;
-  text-transform: uppercase;
-  font-size: $font-xxs;
-  color: lighten($text-mute, 10%);
-  text-align: center;
-  font-weight: bold;
-}
-
-.landing__milestone-item-desc {
-  text-align: center;
-}
-
-// MessageBoardUsers
-.landing__users-container-header {
-  display: flex;
-  justify-content: center;
-  /* align-content: center; */
-  align-items: center;
-
-  button {
-    margin-left: 14px;
-    margin-top: 0 !important;
-  }
-
-  .support-text {
-    color: $text-mute;
-    margin-left: 14px;
-    font-size: $font-s;
-    font-weight: normal;
-  }
-}
-
-.landing__message-board-container {
-  width: 100%;
-  display: grid;
-  //border: 2px solid $ui-border;
-  background: lighten($ui-bg, 1%);
-  border: 1px solid $ui-border-light;
-}
-
-.landing__message-board {
-  //width: 40% !important;
-  justify-self: center;
-
-  .landing__user-outer-container {
-    flex: 0 1 50%;
-  }
-}
-
-.landing__users-container {
-  @extend .landing__page-container !optional;
-  width: 100%;
-  padding: 32px 8px 0 8px;
-}
-
-.landing__user-outer-container {
-  padding: 6px 12px;
-  flex: 0 1 25%;
-}
-
-.landing__user-container {
-  padding: 14px 10px;
-  border: 1px solid $ui-border-light;
-  background-color: white;
-  //margin: 0 1% 10px 1%;
-  line-height: 18px;
-}
-
-.landing__user-header {
-  display: flex;
-  align-items: center;
-}
-
-.landing__user-avatar {
-  flex: 0 0 auto;
-  width: 42px;
-  height: 42px;
-  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-  border-radius: 100%;
-  margin-right: 12px;
-
-  &.country {
-    aspect-ratio: 4/3;
-    border-radius: $spacing-xxxxs;
-    height: unset;
-  }
-}
-
-.landing__user-info {
-  flex-grow: 2;
-  text-align: center;
-}
-
-.landing__user-name {
-  font-weight: 600;
-
-  &.session-user {
-    color: $ui-accent;
-  }
-}
-
-.landing__user-role {
-  color: $text-mute;
-}
diff --git a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/CountryMessageBoard.tsx b/src/client/pages/CountryHome/FraHome/CountryMessageBoard/CountryMessageBoard.tsx
deleted file mode 100644
index d330946eb5..0000000000
--- a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/CountryMessageBoard.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import './CountryMessageBoard.scss'
-import React from 'react'
-
-import { Authorizer } from 'meta/user'
-
-import { useCycle } from 'client/store/assessment'
-import { useUser } from 'client/store/user'
-import { useCountryIso } from 'client/hooks'
-
-import MessageBoard from './MessageBoard'
-import MessageBoardUsers from './MessageBoardUsers'
-
-const CountryMessageBoard: React.FC = () => {
-  const countryIso = useCountryIso()
-  const cycle = useCycle()
-  const user = useUser()
-
-  return (
-    <div className="landing__page-container">
-      <div className="landing__message-board-container">
-        <MessageBoard />
-        {Authorizer.canViewUsers({ countryIso, cycle, user }) && <MessageBoardUsers />}
-      </div>
-    </div>
-  )
-}
-
-export default CountryMessageBoard
diff --git a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageBoard.tsx b/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageBoard.tsx
deleted file mode 100644
index fc31e92822..0000000000
--- a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageBoard.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { Areas } from 'meta/area'
-import { MessageTopicType, Topics } from 'meta/messageCenter'
-
-import { useCountryIso } from 'client/hooks'
-
-import MessageButton from './MessageButton'
-
-const MessageBoard: React.FC = () => {
-  const countryIso = useCountryIso()
-
-  const i18n = useTranslation()
-
-  return (
-    <div className="landing__users-container landing__message-board">
-      <div className="landing__page-container-header">
-        <h3 className="landing__users-container-header">{i18n.t<string>('countryMessageBoard.messageBoard')}</h3>
-      </div>
-      <div className="landing__user-outer-container">
-        <div className="landing__user-container">
-          <div className="landing__user-header">
-            <img
-              alt=""
-              className="landing__user-avatar country"
-              style={{ backgroundImage: Areas.getCountryBackgroundImg(countryIso), backgroundSize: 'cover' }}
-            />
-            <div className="landing__user-info">
-              <div className="landing__user-role">{i18n.t<string>('countryMessageBoard.messageBoardDesc')}</div>
-              <MessageButton
-                topicKey={Topics.getMessageBoardCountryKey()}
-                topicTitle={i18n.t<string>(Areas.getTranslationKey(countryIso))}
-                topicType={MessageTopicType.messageBoard}
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-export default MessageBoard
diff --git a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageBoardUsers.tsx b/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageBoardUsers.tsx
deleted file mode 100644
index 5c635b809a..0000000000
--- a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageBoardUsers.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-
-import classNames from 'classnames'
-
-import { ApiEndPoint } from 'meta/api/endpoint'
-import { MessageTopicType, Topics } from 'meta/messageCenter'
-import { Users } from 'meta/user'
-
-import { useCycle } from 'client/store/assessment'
-import { useUser } from 'client/store/user'
-import { useCountryIso } from 'client/hooks'
-
-import { useMessageBoardUsers } from './hooks/useMessageBoardUsers'
-import MessageButton from './MessageButton'
-
-const MessageBoardUsers: React.FC = () => {
-  const countryIso = useCountryIso()
-  const cycle = useCycle()
-
-  const { t } = useTranslation()
-  const user = useUser()
-  const users = useMessageBoardUsers()
-
-  if (!user || !users.length) {
-    return null
-  }
-
-  return (
-    <div className="landing__users-container">
-      <div className="landing__page-container-header">
-        <h3 className="landing__users-container-header">{t('countryMessageBoard.oneToOneMessages')}</h3>
-      </div>
-      {users.map((_user) => (
-        <div key={_user.id} className="landing__user-outer-container">
-          <div className="landing__user-container">
-            <div className="landing__user-header">
-              <img alt="" className="landing__user-avatar" src={ApiEndPoint.User.profilePicture(String(_user.id))} />
-              <div className="landing__user-info">
-                <div className={classNames('landing__user-name', { 'session-user': user.id === _user.id })}>
-                  {Users.getFullName(_user)}
-                </div>
-                <div className="landing__user-role">
-                  {t(Users.getI18nRoleLabelKey(Users.getRole(_user, countryIso, cycle)?.role))}
-                </div>
-                {user.id !== _user.id && (
-                  <MessageButton
-                    topicKey={Topics.getMessageBoardChatKey(user, _user)}
-                    topicSubtitle={t('landing.users.message')}
-                    topicTitle={Users.getFullName(_user)}
-                    topicType={MessageTopicType.chat}
-                  />
-                )}
-              </div>
-            </div>
-          </div>
-        </div>
-      ))}
-    </div>
-  )
-}
-export default MessageBoardUsers
diff --git a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageButton/MessageButton.scss b/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageButton/MessageButton.scss
deleted file mode 100644
index cceca9d5cb..0000000000
--- a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageButton/MessageButton.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@import 'src/client/style/partials';
-@import 'src/client/styles/buttons';
-
-.btn-message {
-  @include mixin-button-base($font-m, 7px 14px);
-  margin-top: 12px;
-}
-
-.btn-message-count {
-  margin-left: 10px;
-  border: 1px solid #0098a6;
-  border-radius: 50%;
-  width: 23px;
-  background-color: rgba(0, 152, 166, 0.77);
-  color: white;
-  height: 23px;
-  padding-top: 1px;
-  font-size: 12px;
-  display: inline-block;
-}
diff --git a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageButton/MessageButton.tsx b/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageButton/MessageButton.tsx
deleted file mode 100644
index b9767f383b..0000000000
--- a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageButton/MessageButton.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import './MessageButton.scss'
-import React, { useEffect, useRef } from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { ApiEndPoint } from 'meta/api/endpoint'
-import { MessageTopicType } from 'meta/messageCenter'
-import { Users } from 'meta/user/users'
-
-import { useAppDispatch } from 'client/store'
-import { useAssessment, useCycle } from 'client/store/assessment'
-import { MessageCenterActions } from 'client/store/ui/messageCenter'
-import { useUser } from 'client/store/user'
-import { useCountryIso, useGetRequest } from 'client/hooks'
-import Icon from 'client/components/Icon'
-
-type Props = {
-  topicKey: string
-  topicSubtitle?: string
-  topicTitle: string
-  topicType: MessageTopicType
-}
-
-const MessageButton: React.FC<Props> = ({ topicKey, topicSubtitle, topicTitle, topicType }) => {
-  const countryIso = useCountryIso()
-  const assessment = useAssessment()
-  const cycle = useCycle()
-
-  const i18n = useTranslation()
-  const dispatch = useAppDispatch()
-
-  const user = useUser()
-
-  const { data: unreadMessages = 0, dispatch: fetchData } = useGetRequest(
-    ApiEndPoint.MessageCenter.topicUnreadMessages(),
-    {
-      params: {
-        countryIso,
-        assessmentName: assessment.props.name,
-        cycleName: cycle.name,
-        key: topicKey,
-      },
-    }
-  )
-
-  const fetchRef = useRef(fetchData)
-
-  useEffect(() => fetchRef.current(), [fetchRef])
-
-  return (
-    <button
-      disabled={Users.isAdministrator(user)}
-      type="button"
-      className="btn-secondary btn-message"
-      onClick={() => {
-        dispatch(
-          MessageCenterActions.openTopic({
-            countryIso,
-            assessmentName: assessment.props.name,
-            cycleName: cycle.name,
-            key: topicKey,
-            subtitle: topicSubtitle,
-            title: topicTitle,
-            type: topicType,
-          })
-        )
-      }}
-    >
-      <Icon name="chat-46" className="icon-middle" />
-      {i18n.t<string>('landing.users.message')}
-      {parseInt(unreadMessages, 10) > 0 && <div className="btn-message-count">{unreadMessages}</div>}
-    </button>
-  )
-}
-
-MessageButton.defaultProps = {
-  topicSubtitle: '',
-}
-
-export default MessageButton
diff --git a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/hooks/useMessageBoardUsers.tsx b/src/client/pages/CountryHome/FraHome/CountryMessageBoard/hooks/useMessageBoardUsers.tsx
deleted file mode 100644
index d8e1294150..0000000000
--- a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/hooks/useMessageBoardUsers.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useMemo } from 'react'
-
-import { User, Users } from 'meta/user'
-import { UserRoles } from 'meta/user/userRoles'
-
-import { useCycle } from 'client/store/assessment'
-import { useUsers } from 'client/store/ui/userManagement'
-import { useCountryRouteParams } from 'client/hooks/useRouteParams'
-
-export const useMessageBoardUsers = (): Array<User> => {
-  const { countryIso } = useCountryRouteParams()
-  const cycle = useCycle()
-  const users = useUsers()
-
-  return useMemo<Array<User>>(
-    () =>
-      users.filter((user) => {
-        const role = Users.getRole(user, countryIso, cycle)
-        if (!role) return false
-        return !(Users.isAdministrator(user) || UserRoles.isInvitationPending(role))
-      }),
-    [countryIso, cycle, users]
-  )
-}
diff --git a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/index.ts b/src/client/pages/CountryHome/FraHome/CountryMessageBoard/index.ts
deleted file mode 100644
index 037d6af2d5..0000000000
--- a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './CountryMessageBoard'
diff --git a/src/client/pages/CountryHome/FraHome/FraHome.tsx b/src/client/pages/CountryHome/FraHome/FraHome.tsx
index 6fb2afee5d..6986d7a934 100644
--- a/src/client/pages/CountryHome/FraHome/FraHome.tsx
+++ b/src/client/pages/CountryHome/FraHome/FraHome.tsx
@@ -1,62 +1,22 @@
 import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { Navigate, NavLink, Route, Routes } from 'react-router-dom'
+import { Navigate, Route, Routes } from 'react-router-dom'
 
-import classNames from 'classnames'
-
-import { Areas } from 'meta/area'
-
-import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import CountryHeader from 'client/pages/CountryHome/CountryHeader'
 
 import { useSections } from './hooks/useSections'
-import ButtonDownloadDashboard from './ButtonDownloadDashboard'
-import CountrySelector from './CountrySelector'
-import SelectedCountries from './SelectedCountries'
 
 const FraHome: React.FC = () => {
-  const { t } = useTranslation()
-  const { countryIso } = useCountryRouteParams()
   const sections = useSections()
 
-  // tabs are available when user is logged-in and selected area is country
-  const displayTabs = sections.length > 1 && Areas.isISOCountry(countryIso)
-
   return (
     <>
-      <div className="landing__page-header space-between">
-        <h1 className="landing__page-title title">
-          {t(`area.${countryIso}.listName`)}
-          <ButtonDownloadDashboard />
-        </h1>
-
-        {Areas.isISOGlobal(countryIso) && <CountrySelector />}
-      </div>
-
-      {Areas.isISOGlobal(countryIso) && <SelectedCountries />}
-
-      {displayTabs && (
-        <div className="landing__page-menu">
-          {sections.map(({ name }) => (
-            <NavLink
-              key={name}
-              to={name}
-              className={(navData) =>
-                classNames('btn landing__page-menu-button', {
-                  disabled: navData.isActive,
-                })
-              }
-            >
-              {t(`landing.sections.${name}`)}
-            </NavLink>
-          ))}
-        </div>
-      )}
+      <CountryHeader sections={sections} />
 
       <Routes>
         {sections.map(({ name, component }) => (
-          <Route key={name} path={`${name}/*`} element={React.createElement(component, {})} />
+          <Route key={name} element={React.createElement(component, {})} path={`${name}/*`} />
         ))}
-        {sections.length >= 1 && <Route index element={<Navigate replace to={sections[0].name} />} />}
+        {sections.length >= 1 && <Route element={<Navigate replace to={sections[0].name} />} index />}
       </Routes>
     </>
   )
diff --git a/src/client/pages/CountryHome/FraHome/hooks/useSections.tsx b/src/client/pages/CountryHome/FraHome/hooks/useSections.tsx
index 38fe9f9d93..04762f9eb9 100644
--- a/src/client/pages/CountryHome/FraHome/hooks/useSections.tsx
+++ b/src/client/pages/CountryHome/FraHome/hooks/useSections.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 
 import { Areas } from 'meta/area'
 import { Cycles } from 'meta/assessment'
@@ -6,45 +6,46 @@ import { SectionNames } from 'meta/routes'
 import { Users } from 'meta/user'
 
 import { useCycle } from 'client/store/assessment'
-import { useUser } from 'client/store/user'
+import { useCanSeeUserActivities, useUser } from 'client/store/user'
 import { useCountryRouteParams } from 'client/hooks/useRouteParams'
-import Collaborators from 'client/pages/CountryHome/FraHome/Collaborators'
-import CountryMessageBoard from 'client/pages/CountryHome/FraHome/CountryMessageBoard'
+import Collaborators from 'client/pages/CountryHome/Collaborators'
 import RecentActivity from 'client/pages/CountryHome/FraHome/RecentActivity'
 import Overview from 'client/pages/CountryHome/Overview'
 import Repository from 'client/pages/CountryHome/Repository'
+import { CountryHomeSection } from 'client/pages/CountryHome/types'
 
-type Section = {
-  name: string
-  component: React.FC
-}
-
-export const useSections = (): Array<Section> => {
+export const useSections = (): Array<CountryHomeSection> => {
   const user = useUser()
   const { countryIso } = useCountryRouteParams()
   const cycle = useCycle()
 
+  const canSeeUserActivities = useCanSeeUserActivities(user)
+
   return useMemo(() => {
-    const sections: Array<Section> = []
+    const sections: Array<CountryHomeSection> = []
 
     if (!cycle) return null
-
+    const isCountry = Areas.isISOCountry(countryIso)
     const showOverview = Cycles.isPublished(cycle) || Areas.isISOCountry(countryIso)
+    const hasRoleInCountry = user && isCountry && Users.hasRoleInCountry({ countryIso, cycle, user })
 
     if (showOverview) {
       sections.push({ name: SectionNames.Country.Home.overview, component: Overview })
     }
 
-    if (user) {
-      sections.push({ name: SectionNames.Country.Home.messageBoard, component: CountryMessageBoard })
-      sections.push({ name: SectionNames.Country.Home.recentActivity, component: RecentActivity })
+    if (hasRoleInCountry) {
       sections.push({ name: SectionNames.Country.Home.repository, component: Repository })
     }
 
-    if (Users.getRolesAllowedToView({ user, countryIso, cycle }).length > 0) {
-      sections.splice(2, 0, { name: SectionNames.Country.Home.userManagement, component: Collaborators })
+    if (canSeeUserActivities && isCountry) {
+      sections.splice(2, 0, { name: SectionNames.Country.Home.collaborators, component: Collaborators })
+    }
+
+    // Show recent activity as last item
+    if (canSeeUserActivities && isCountry) {
+      sections.push({ name: SectionNames.Country.Home.recentActivity, component: RecentActivity })
     }
 
     return sections
-  }, [cycle, user, countryIso])
+  }, [cycle, countryIso, user, canSeeUserActivities])
 }
diff --git a/src/client/pages/CountryHome/MessageButton/MessageButton.scss b/src/client/pages/CountryHome/MessageButton/MessageButton.scss
new file mode 100644
index 0000000000..1e3312f27e
--- /dev/null
+++ b/src/client/pages/CountryHome/MessageButton/MessageButton.scss
@@ -0,0 +1,14 @@
+@import 'src/client/style/partials';
+@import 'src/client/styles/buttons';
+
+.btn-message__count {
+  align-items: center;
+  background-color: rgba(0, 152, 166, 0.77);
+  border-radius: 50%;
+  color: white;
+  display: flex;
+  font-size: $font-xxs;
+  height: 18px;
+  justify-content: center;
+  width: 18px;
+}
diff --git a/src/client/pages/CountryHome/MessageButton/MessageButton.tsx b/src/client/pages/CountryHome/MessageButton/MessageButton.tsx
new file mode 100644
index 0000000000..292cad5127
--- /dev/null
+++ b/src/client/pages/CountryHome/MessageButton/MessageButton.tsx
@@ -0,0 +1,58 @@
+import './MessageButton.scss'
+import React, { useCallback, useEffect, useRef } from 'react'
+
+import { ApiEndPoint } from 'meta/api/endpoint'
+import { CountryIso } from 'meta/area'
+import { MessageTopic } from 'meta/messageCenter'
+import { Users } from 'meta/user/users'
+
+import { useAppDispatch } from 'client/store'
+import { MessageCenterActions } from 'client/store/ui/messageCenter'
+import { useUser } from 'client/store/user'
+import { useGetRequest } from 'client/hooks'
+import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import Button, { ButtonProps } from 'client/components/Buttons/Button'
+
+type Props = Pick<ButtonProps, 'inverse' | 'label' | 'size'> & {
+  topic: Pick<MessageTopic, 'key' | 'subtitle' | 'type'> & { title: string }
+}
+
+const MessageButton: React.FC<Props> = (props) => {
+  const { inverse, label, size, topic } = props
+  const { assessmentName, cycleName, countryIso } = useCountryRouteParams<CountryIso>()
+
+  const dispatch = useAppDispatch()
+
+  const user = useUser()
+
+  const params = { countryIso, assessmentName, cycleName, key: topic.key }
+  const url = ApiEndPoint.MessageCenter.topicUnreadMessages()
+  const { data: unreadMessages = 0, dispatch: fetchData } = useGetRequest(url, { params })
+
+  const fetchRef = useRef(fetchData)
+
+  const onClick = useCallback(() => {
+    const params = { assessmentName, countryIso, cycleName, ...topic }
+    dispatch(MessageCenterActions.openTopic(params))
+  }, [assessmentName, countryIso, cycleName, dispatch, topic])
+
+  useEffect(() => fetchRef.current(), [fetchRef])
+
+  return (
+    <Button
+      disabled={Users.isAdministrator(user)}
+      iconName="chat-46"
+      inverse={inverse}
+      label={
+        <>
+          {label}
+          {parseInt(unreadMessages, 10) > 0 && <div className="btn-message__count">{unreadMessages}</div>}
+        </>
+      }
+      onClick={onClick}
+      size={size}
+    />
+  )
+}
+
+export default MessageButton
diff --git a/src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageButton/index.ts b/src/client/pages/CountryHome/MessageButton/index.ts
similarity index 100%
rename from src/client/pages/CountryHome/FraHome/CountryMessageBoard/MessageButton/index.ts
rename to src/client/pages/CountryHome/MessageButton/index.ts
diff --git a/src/client/pages/CountryHome/PanEuropeanHome/PanEuropeanHome.tsx b/src/client/pages/CountryHome/PanEuropeanHome/PanEuropeanHome.tsx
index 396638eb1c..107187f807 100644
--- a/src/client/pages/CountryHome/PanEuropeanHome/PanEuropeanHome.tsx
+++ b/src/client/pages/CountryHome/PanEuropeanHome/PanEuropeanHome.tsx
@@ -1,51 +1,29 @@
 import './PanEuropeanHome.scss'
 import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { Navigate, NavLink, Route, Routes } from 'react-router-dom'
+import { Navigate, Route, Routes } from 'react-router-dom'
 
-import classNames from 'classnames'
-
-import { Areas } from 'meta/area'
 import { SectionNames } from 'meta/routes'
 
-import { useCountryRouteParams } from 'client/hooks/useRouteParams'
+import CountryHeader from 'client/pages/CountryHome/CountryHeader'
 
 import { useSections } from './hooks/useSections'
 
 const PanEuropeanHome: React.FC = () => {
-  const { t } = useTranslation()
-  const { countryIso } = useCountryRouteParams()
   const sections = useSections()
 
-  const displayTabs = sections.length > 1 && Areas.isISOCountry(countryIso)
-
   return (
     <>
-      {displayTabs && (
-        <div className="landing__page-menu">
-          {sections.map(({ name }) => (
-            <NavLink
-              key={name}
-              to={name}
-              className={(navData) =>
-                classNames('btn landing__page-menu-button', {
-                  disabled: navData.isActive,
-                })
-              }
-            >
-              {t(`landing.sections.${name}`)}
-            </NavLink>
-          ))}
-        </div>
-      )}
+      <CountryHeader sections={sections} showRegionLabel={false} />
+
       <Routes>
         {sections.map(({ name, component }) => (
-          <Route key={name} path={`${name}/*`} element={React.createElement(component, {})} />
+          <Route key={name} element={React.createElement(component, {})} path={`${name}/*`} />
         ))}
 
-        <Route index element={<Navigate replace to={SectionNames.Country.Home.overview} />} />
+        <Route element={<Navigate replace to={SectionNames.Country.Home.overview} />} index />
       </Routes>
     </>
   )
 }
+
 export default PanEuropeanHome
diff --git a/src/client/pages/CountryHome/PanEuropeanHome/hooks/useSections.tsx b/src/client/pages/CountryHome/PanEuropeanHome/hooks/useSections.tsx
index d849d5b3ff..6e3aaa0dba 100644
--- a/src/client/pages/CountryHome/PanEuropeanHome/hooks/useSections.tsx
+++ b/src/client/pages/CountryHome/PanEuropeanHome/hooks/useSections.tsx
@@ -1,37 +1,33 @@
-import React from 'react'
-
 import { SectionNames } from 'meta/routes'
 import { Users } from 'meta/user'
 
 import { useCycle } from 'client/store/assessment'
-import { useUser } from 'client/store/user'
+import { useCanSeeUserActivities, useUser } from 'client/store/user'
 import { useCountryIso } from 'client/hooks'
-import Collaborators from 'client/pages/CountryHome/FraHome/Collaborators'
-import CountryMessageBoard from 'client/pages/CountryHome/FraHome/CountryMessageBoard'
+import Collaborators from 'client/pages/CountryHome/Collaborators'
 import RecentActivity from 'client/pages/CountryHome/FraHome/RecentActivity'
 import Repository from 'client/pages/CountryHome/Repository'
+import { CountryHomeSection } from 'client/pages/CountryHome/types'
 
 import Overview from '../Overview'
 
-type Section = {
-  name: string
-  component: React.FC
-}
-
-export const useSections = (): Array<Section> => {
+export const useSections = (): Array<CountryHomeSection> => {
   const user = useUser()
   const countryIso = useCountryIso()
   const cycle = useCycle()
+  const canSeeActivities = useCanSeeUserActivities(user)
 
-  const sections: Array<Section> = [{ name: SectionNames.Country.Home.overview, component: Overview }]
+  const sections: Array<CountryHomeSection> = [{ name: SectionNames.Country.Home.overview, component: Overview }]
 
   if (user) {
-    sections.push({ name: SectionNames.Country.Home.messageBoard, component: CountryMessageBoard })
-    sections.push({ name: SectionNames.Country.Home.recentActivity, component: RecentActivity })
     sections.push({ name: SectionNames.Country.Home.repository, component: Repository })
   }
   if (Users.getRolesAllowedToEdit({ user, countryIso, cycle }).length > 0) {
-    sections.splice(2, 0, { name: SectionNames.Country.Home.userManagement, component: Collaborators })
+    sections.splice(2, 0, { name: SectionNames.Country.Home.collaborators, component: Collaborators })
+  }
+
+  if (canSeeActivities) {
+    sections.push({ name: SectionNames.Country.Home.recentActivity, component: RecentActivity })
   }
 
   return sections
diff --git a/src/client/pages/CountryHome/types.ts b/src/client/pages/CountryHome/types.ts
new file mode 100644
index 0000000000..124f252357
--- /dev/null
+++ b/src/client/pages/CountryHome/types.ts
@@ -0,0 +1,6 @@
+import React from 'react'
+
+export type CountryHomeSection = {
+  name: string
+  component: React.FC
+}
diff --git a/src/client/pages/Login/Invitation/Invitation.tsx b/src/client/pages/Login/Invitation/Invitation.tsx
index 469ac9af71..6679b9b85e 100644
--- a/src/client/pages/Login/Invitation/Invitation.tsx
+++ b/src/client/pages/Login/Invitation/Invitation.tsx
@@ -4,8 +4,7 @@ import { Navigate, Outlet, useNavigate } from 'react-router-dom'
 
 import { Assessments } from 'meta/assessment'
 import { LoginInvitationQueryParams, Routes } from 'meta/routes'
-import { Users } from 'meta/user'
-import { UserRoles } from 'meta/user/userRoles'
+import { UserInvitations, Users } from 'meta/user'
 
 import { useAppDispatch } from 'client/store'
 import { LoginActions, useInvitation } from 'client/store/login'
@@ -25,9 +24,9 @@ const Invitation: React.FC = () => {
   useInitInvitation()
 
   const { invitationUuid } = useSearchParams<LoginInvitationQueryParams>()
-  const { assessment, invitedUser, userProviders, userRole } = useInvitation()
+  const { assessment, invitedUser, userProviders, userInvitation } = useInvitation()
 
-  const cycle = assessment?.cycles.find((cycle) => cycle.uuid === userRole.cycleUuid)
+  const cycle = assessment?.cycles.find((cycle) => cycle.uuid === userInvitation.cycleUuid)
   const assessmentName = assessment?.props.name
   const cycleName = cycle?.name
 
@@ -36,14 +35,18 @@ const Invitation: React.FC = () => {
     navigate(Routes.Root.generatePath())
   }
 
-  if (userRole?.acceptedAt) {
+  // If the invitation has been accepted...
+  if (userInvitation?.acceptedAt) {
+    // ...and the user is already logged in, redirect to root
     if (loggedUser) {
-      return <Navigate to={Routes.Root.generatePath()} replace />
+      return <Navigate replace to={Routes.Root.generatePath()} />
     }
-    return <Navigate to={Routes.Login.generatePath({ assessmentName, cycleName })} replace />
+    // and the user is not logged in, redirect to login
+    return <Navigate replace to={Routes.Login.generatePath({ assessmentName, cycleName })} />
   }
 
-  if (userRole && UserRoles.isInvitationExpired(userRole)) {
+  // If the invitation is expired, show error message
+  if (userInvitation && UserInvitations.isExpired(userInvitation)) {
     return (
       <div className="login__form">
         <h3>{t('login.invitationExpired')}</h3>
@@ -53,16 +56,19 @@ const Invitation: React.FC = () => {
 
   if (!invitedUser) return null
 
+  const invitationMessageParams = {
+    assessment: t(Assessments.getShortLabel(assessmentName)),
+    country: t(`area.${userInvitation.countryIso}.listName`),
+    cycle: cycleName,
+    role: t(Users.getI18nRoleLabelKey(userInvitation.role)),
+  }
+  const invitationMessage = t('login.invitationMessage', invitationMessageParams)
+
+  const isInvitedUserLoggedIn = loggedUser?.email === invitedUser.email
+
   return (
     <div className="login__formWrapper">
-      <h3>
-        {t('login.invitationMessage', {
-          assessment: t(Assessments.getShortLabel(assessmentName)),
-          country: t(`area.${userRole.countryIso}.listName`),
-          cycle: cycleName,
-          role: t(Users.getI18nRoleLabelKey(userRole.role)),
-        })}
-      </h3>
+      <h3>{invitationMessage}</h3>
 
       {userProviders?.length > 0 && (
         <h3>{t('login.invitationProvidersRegistered', { authProviderNames: userProviders.join(', ') })}</h3>
@@ -70,8 +76,8 @@ const Invitation: React.FC = () => {
 
       <Outlet />
 
-      {loggedUser?.email === invitedUser.email ? (
-        <button type="button" className="btn" onClick={onAccept}>
+      {isInvitedUserLoggedIn ? (
+        <button className="btn" onClick={onAccept} type="button">
           {t('login.acceptInvitation')}
         </button>
       ) : (
diff --git a/src/client/pages/Login/InvitationLocal/InvitationLocal.tsx b/src/client/pages/Login/InvitationLocal/InvitationLocal.tsx
index ee277469b9..12800ba119 100644
--- a/src/client/pages/Login/InvitationLocal/InvitationLocal.tsx
+++ b/src/client/pages/Login/InvitationLocal/InvitationLocal.tsx
@@ -5,8 +5,7 @@ import { Link, Navigate } from 'react-router-dom'
 import { Objects } from 'utils/objects'
 
 import { LoginInvitationQueryParams, Routes } from 'meta/routes'
-import { AuthProvider } from 'meta/user'
-import { UserRoles } from 'meta/user/userRoles'
+import { AuthProvider, UserInvitations } from 'meta/user'
 
 import { useAppDispatch } from 'client/store'
 import { LoginActions, useInvitation } from 'client/store/login'
@@ -15,12 +14,6 @@ import { useUser } from 'client/store/user'
 import { useSearchParams } from 'client/hooks/useSearchParams'
 import { useInitInvitation } from 'client/pages/Login/Invitation/hooks/useInitInvitation'
 
-export type InvitationLocalFormData = {
-  email: string
-  password: string
-  password2: string
-}
-
 const InvitationLocal: React.FC = () => {
   const { t } = useTranslation()
   const dispatch = useAppDispatch()
@@ -30,12 +23,12 @@ const InvitationLocal: React.FC = () => {
   useInitInvitation()
 
   const { invitationUuid, lang } = useSearchParams<LoginInvitationQueryParams>()
-  const { assessment, invitedUser, userProviders, userRole } = useInvitation()
+  const { assessment, invitedUser, userProviders, userInvitation } = useInvitation()
 
   const formData = useAcceptInvitationForm()
   const errors = formData?.errors ?? {}
 
-  const cycle = assessment?.cycles.find((cycle) => cycle.uuid === userRole.cycleUuid)
+  const cycle = assessment?.cycles.find((cycle) => cycle.uuid === userInvitation.cycleUuid)
   const assessmentName = assessment?.props.name
   const cycleName = cycle?.name
 
@@ -53,13 +46,13 @@ const InvitationLocal: React.FC = () => {
 
   if (
     loggedUser?.email === invitedUser.email ||
-    userRole?.acceptedAt ||
-    (userRole && UserRoles.isInvitationExpired(userRole))
+    userInvitation?.acceptedAt ||
+    (userInvitation && UserInvitations.isExpired(userInvitation))
   ) {
     return (
       <Navigate
-        to={Routes.LoginInvitation.generatePath({ cycleName, assessmentName }, { invitationUuid, lang })}
         replace
+        to={Routes.LoginInvitation.generatePath({ cycleName, assessmentName }, { invitationUuid, lang })}
       />
     )
   }
@@ -70,8 +63,8 @@ const InvitationLocal: React.FC = () => {
         <input
           disabled={!!invitedUser}
           name="email"
-          onFocus={() => LoginActions.updateAcceptInvitationFormErrors({ email: null })}
           onChange={(event) => dispatch(LoginActions.updateAcceptInvitationForm({ email: event.target.value }))}
+          onFocus={() => LoginActions.updateAcceptInvitationFormErrors({ email: null })}
           placeholder={t('login.email')}
           type="text"
           value={formData?.email ?? ''}
@@ -79,8 +72,8 @@ const InvitationLocal: React.FC = () => {
         {errors.email?.length > 0 && <span className="login__field-error">{t(errors.email)}</span>}
 
         <input
-          onFocus={() => LoginActions.updateAcceptInvitationFormErrors({ password: null })}
           onChange={(event) => dispatch(LoginActions.updateAcceptInvitationForm({ password: event.target.value }))}
+          onFocus={() => LoginActions.updateAcceptInvitationFormErrors({ password: null })}
           placeholder={t('login.password')}
           type="password"
           value={formData?.password ?? ''}
@@ -90,8 +83,8 @@ const InvitationLocal: React.FC = () => {
         {showPassword2 && (
           <>
             <input
-              onFocus={() => LoginActions.updateAcceptInvitationFormErrors({ password2: null })}
               onChange={(event) => dispatch(LoginActions.updateAcceptInvitationForm({ password2: event.target.value }))}
+              onFocus={() => LoginActions.updateAcceptInvitationFormErrors({ password2: null })}
               placeholder={t('login.repeatPassword')}
               type="password"
               value={formData?.password2 ?? ''}
diff --git a/src/client/pages/Login/components/AcceptInvitationButtons/AcceptInvitationButtons.tsx b/src/client/pages/Login/components/AcceptInvitationButtons/AcceptInvitationButtons.tsx
index cce7778723..c9ec09a49c 100644
--- a/src/client/pages/Login/components/AcceptInvitationButtons/AcceptInvitationButtons.tsx
+++ b/src/client/pages/Login/components/AcceptInvitationButtons/AcceptInvitationButtons.tsx
@@ -20,9 +20,9 @@ const AcceptInvitationButtons: React.FC = () => {
   const navigate = useNavigate()
 
   const { invitationUuid, lang } = useSearchParams<LoginInvitationQueryParams>()
-  const { assessment, invitedUser, userProviders, userRole } = useInvitation()
+  const { assessment, invitedUser, userProviders, userInvitation } = useInvitation()
 
-  const cycle = assessment?.cycles.find((cycle) => cycle.uuid === userRole.cycleUuid)
+  const cycle = assessment?.cycles.find((cycle) => cycle.uuid === userInvitation.cycleUuid)
   const assessmentName = assessment?.props.name
   const cycleName = cycle?.name
 
@@ -43,10 +43,10 @@ const AcceptInvitationButtons: React.FC = () => {
   return (
     <>
       <button
-        type="button"
         className="btn"
-        onClick={isInInvitationLocal ? onAcceptInvitationLocal : goToAcceptInvitationLocal}
         disabled={isInInvitationLocal ? loginInfo?.isLoading : false}
+        onClick={isInInvitationLocal ? onAcceptInvitationLocal : goToAcceptInvitationLocal}
+        type="button"
       >
         {t('login.acceptInvitationWithFra')}
       </button>
@@ -57,7 +57,7 @@ const AcceptInvitationButtons: React.FC = () => {
         rel="noreferrer"
         target="_blank"
       >
-        <Icon name="video" className="icon-sub" /> {t(videoResources[0].labelKeyShort)}
+        <Icon className="icon-sub" name="video" /> {t(videoResources[0].labelKeyShort)}
       </a>
 
       <div className="divider" />
@@ -75,7 +75,7 @@ const AcceptInvitationButtons: React.FC = () => {
         rel="noreferrer"
         target="_blank"
       >
-        <Icon name="video" className="icon-sub" /> {t(videoResources[1].labelKeyShort)}
+        <Icon className="icon-sub" name="video" /> {t(videoResources[1].labelKeyShort)}
       </a>
     </>
   )
diff --git a/src/client/pages/PageRoutes/hooks/useRoutes.tsx b/src/client/pages/PageRoutes/hooks/useRoutes.tsx
index 9bf897076e..d2012c1848 100644
--- a/src/client/pages/PageRoutes/hooks/useRoutes.tsx
+++ b/src/client/pages/PageRoutes/hooks/useRoutes.tsx
@@ -6,7 +6,7 @@ import { Routes } from 'meta/routes/routes'
 
 import PageLayout from 'client/components/PageLayout'
 import Admin from 'client/pages/Admin'
-import UserManagement from 'client/pages/Admin/UserManagement'
+import AdminCollaborators from 'client/pages/AdminCollaborators'
 import AdminCountries from 'client/pages/AdminCountries'
 import AdminInvitations from 'client/pages/AdminInvitations'
 import AdminLinks from 'client/pages/AdminLinks'
@@ -46,7 +46,7 @@ export const useRoutes = () => {
                 <Route element={<AdminCountries />} path={Routes.AdminCountries.path.relative} />
                 <Route element={<AdminInvitations />} path={Routes.AdminInvitations.path.relative} />
                 <Route element={<AdminLinks />} path={Routes.AdminLinks.path.relative} />
-                <Route element={<UserManagement />} path={Routes.AdminUserManagement.path.relative} />
+                <Route element={<AdminCollaborators />} path={Routes.AdminCollaborators.path.relative} />
               </Route>
 
               {/* Tutorials */}
diff --git a/src/client/store/login/slice.ts b/src/client/store/login/slice.ts
index 5e1abf5aec..30a1f118af 100644
--- a/src/client/store/login/slice.ts
+++ b/src/client/store/login/slice.ts
@@ -50,8 +50,8 @@ export const loginSlice = createSlice({
     builder.addCase(acceptInvitation.fulfilled, () => initialState)
 
     builder.addCase(fetchUserByInvitation.fulfilled, (state, { payload }) => {
-      const { assessment, user, userRole, userProviders } = payload
-      state.invitation = { assessment, invitedUser: user, userRole, userProviders }
+      const { assessment, user, userInvitation, userProviders } = payload
+      state.invitation = { assessment, invitedUser: user, userInvitation, userProviders }
     })
 
     builder.addCase(initLogin.fulfilled, (state, { payload }) => {
diff --git a/src/client/store/login/stateType.ts b/src/client/store/login/stateType.ts
index 792a76cb10..203f4116c5 100644
--- a/src/client/store/login/stateType.ts
+++ b/src/client/store/login/stateType.ts
@@ -1,5 +1,5 @@
 import { Assessment } from 'meta/assessment'
-import { AuthProvider, RoleName, User, UserRole } from 'meta/user'
+import { AuthProvider, User, UserInvitation } from 'meta/user'
 
 export type AcceptInvitationFormFields = {
   email?: string
@@ -17,7 +17,7 @@ export interface InvitationState {
   assessment?: Assessment
   invitedUser?: User
   userProviders?: Array<AuthProvider>
-  userRole?: UserRole<RoleName>
+  userInvitation?: UserInvitation
   acceptForm?: AcceptInvitationFormState
 }
 
diff --git a/src/client/store/ui/tablePaginated/hooks/index.ts b/src/client/store/ui/tablePaginated/hooks/index.ts
index 752af6ce87..ed9a0121d2 100644
--- a/src/client/store/ui/tablePaginated/hooks/index.ts
+++ b/src/client/store/ui/tablePaginated/hooks/index.ts
@@ -1,4 +1,6 @@
-import { TablePaginatedFilterValues, TablePaginatedOrderBy } from 'meta/tablePaginated'
+import { Objects } from 'utils/objects'
+
+import { TablePaginatedCompareFn, TablePaginatedFilterValues, TablePaginatedOrderBy } from 'meta/tablePaginated'
 
 import { useAppSelector } from 'client/store/store'
 import { TablePaginatedSelectors } from 'client/store/ui/tablePaginated/selectors'
@@ -9,8 +11,14 @@ export const useIsTablePaginatedInitialized = (path: string): boolean =>
 export const useTablePaginatedCount = (path: string): { total: number } =>
   useAppSelector((state) => TablePaginatedSelectors.getCount(state, path))
 
-export const useTablePaginatedData = <Datum>(path: string): Array<Datum> | undefined =>
-  useAppSelector((state) => TablePaginatedSelectors.getData(state, path) as Array<Datum> | undefined)
+export const useTablePaginatedData = <Datum extends object>(
+  path: string,
+  compareFn?: TablePaginatedCompareFn<Datum>
+): Array<Datum> | undefined => {
+  const data = useAppSelector((state) => TablePaginatedSelectors.getData(state, path) as Array<Datum> | undefined)
+  if (!Objects.isEmpty(data) && !Objects.isNil(compareFn)) return [...data].sort(compareFn)
+  return data
+}
 
 export const useTablePaginatedFilters = (path: string): Record<string, TablePaginatedFilterValues> | undefined =>
   useAppSelector((state) => TablePaginatedSelectors.getFilters(state, path))
diff --git a/src/client/store/ui/userManagement/actions/updateUser.ts b/src/client/store/ui/userManagement/actions/updateUser.ts
index e2919436d6..930ddab17a 100644
--- a/src/client/store/ui/userManagement/actions/updateUser.ts
+++ b/src/client/store/ui/userManagement/actions/updateUser.ts
@@ -27,7 +27,7 @@ const putUser = Functions.debounce(
       formData.append('id', String(user.id))
       if (profilePicture) formData.append('profilePicture', profilePicture)
       formData.append('user', JSON.stringify(user))
-      await axios.put(ApiEndPoint.User.many(), formData, {
+      await axios.put(ApiEndPoint.User.one(), formData, {
         headers: {
           'Content-Type': 'multipart/form-data',
         },
diff --git a/src/client/store/ui/userManagement/actions/updateUserAdminRole.ts b/src/client/store/ui/userManagement/actions/updateUserAdminRole.ts
index e05ae81049..b23224988f 100644
--- a/src/client/store/ui/userManagement/actions/updateUserAdminRole.ts
+++ b/src/client/store/ui/userManagement/actions/updateUserAdminRole.ts
@@ -4,10 +4,10 @@ import axios from 'axios'
 import { ApiEndPoint } from 'meta/api/endpoint'
 import { User } from 'meta/user'
 
-export const updateUserAdminRole = createAsyncThunk<User, { userId: number }>(
+export const updateUserAdminRole = createAsyncThunk<User, { userUuid: User['uuid'] }>(
   'userManagement/post/updateUserAdminRole',
-  async ({ userId }) => {
-    const { data } = await axios.post(ApiEndPoint.User.adminRole(), { userId })
+  async ({ userUuid }) => {
+    const { data } = await axios.post(ApiEndPoint.User.adminRole(), { userUuid })
 
     return data
   }
diff --git a/src/client/store/ui/userManagement/actions/updateUserRoles.ts b/src/client/store/ui/userManagement/actions/updateUserRoles.ts
index 7221cf2e34..787900b6e5 100644
--- a/src/client/store/ui/userManagement/actions/updateUserRoles.ts
+++ b/src/client/store/ui/userManagement/actions/updateUserRoles.ts
@@ -1,19 +1,19 @@
 import { createAsyncThunk } from '@reduxjs/toolkit'
-import { Functions } from 'utils/functions'
 import axios from 'axios'
 import { Dispatch } from 'redux'
+import { Functions } from 'utils/functions'
 
 import { ApiEndPoint } from 'meta/api/endpoint'
-import { AssessmentName } from 'meta/assessment'
-import { RoleName, UserRole } from 'meta/user'
+import { AssessmentName, CycleName } from 'meta/assessment'
+import { RoleName, User, UserRole } from 'meta/user'
 
 import { UserManagementActions } from '../slice'
 
 type Params = {
   assessmentName: AssessmentName
-  cycleName: string
+  cycleName: CycleName
   roles: Array<Partial<UserRole<RoleName>>>
-  userId: number
+  userUuid: User['uuid']
 }
 
 const postUserRoles = Functions.debounce(
diff --git a/src/client/store/ui/userManagement/hooks/index.ts b/src/client/store/ui/userManagement/hooks/index.ts
index 7c28c224b3..236f167bc4 100644
--- a/src/client/store/ui/userManagement/hooks/index.ts
+++ b/src/client/store/ui/userManagement/hooks/index.ts
@@ -1,7 +1,10 @@
-import { User } from 'meta/user'
+import { CountryUserSummary, User } from 'meta/user'
 
 import { useAppSelector } from 'client/store/store'
 
 export const useUserToEdit = (): User => useAppSelector((state) => state.ui.userManagement.user)
 
-export const useUsers = (): Array<User> => useAppSelector((state) => state.ui.userManagement.users)
+/**
+ * @deprecated
+ */
+export const useUsers = (): Array<CountryUserSummary> => useAppSelector((state) => state.ui.userManagement.users)
diff --git a/src/client/store/ui/userManagement/slice.ts b/src/client/store/ui/userManagement/slice.ts
index b87973b0d7..f1ecda78a5 100644
--- a/src/client/store/ui/userManagement/slice.ts
+++ b/src/client/store/ui/userManagement/slice.ts
@@ -34,7 +34,7 @@ export const userManagementSlice = createSlice({
   },
   extraReducers: (builder) => {
     builder.addCase(removeInvitation.fulfilled, (state, { payload }) => {
-      const i = state.users.findIndex((u) => u.id === payload.userId)
+      const i = state.users.findIndex((u) => u.uuid === payload.userUuid)
       if (i !== -1) state.users.splice(i, 1)
     })
 
@@ -47,7 +47,7 @@ export const userManagementSlice = createSlice({
     })
 
     builder.addCase(sendInvitationEmail.fulfilled, (state, { payload }) => {
-      const i = state.users.findIndex((u) => u.id === payload.userId)
+      const i = state.users.findIndex((u) => u.uuid === payload.userUuid)
       if (i !== -1) state.users[i].roles = [payload]
     })
 
diff --git a/src/client/store/ui/userManagement/stateType.ts b/src/client/store/ui/userManagement/stateType.ts
index 666b4701f8..da78d2c366 100644
--- a/src/client/store/ui/userManagement/stateType.ts
+++ b/src/client/store/ui/userManagement/stateType.ts
@@ -1,6 +1,9 @@
-import { User } from 'meta/user'
+import { CountryUserSummary, User } from 'meta/user'
 
 export interface UserManagementState {
   user?: User
-  users: Array<User>
+  /**
+   * @deprecated
+   */
+  users: Array<CountryUserSummary>
 }
diff --git a/src/client/store/user/hooks/index.ts b/src/client/store/user/hooks/index.ts
index e477204dd1..d330e279ce 100644
--- a/src/client/store/user/hooks/index.ts
+++ b/src/client/store/user/hooks/index.ts
@@ -130,3 +130,46 @@ export const useCanViewReview = (sectionName: string) => {
   const canView = Authorizer.canViewReview({ country, cycle, section, user })
   return !print && !isDataLocked && canView
 }
+
+/**
+ * React hook to determine whether given user has access to edit user activities (eg. Resend or delete invitation)
+ *
+ * @param user - The user
+ * @returns boolean indicating whether the user can edit user activities
+ *
+ * @example
+ * const user = useUser();
+ * const canEditActivities = useCanEditUserActivities(user);
+ *
+ * if (!canEditActivities) {
+ *   // Hide activities UI (eg invitation actions)
+ * }
+ */
+export const useCanEditUserActivities = (user: User) => {
+  const { countryIso } = useCountryRouteParams()
+  const cycle = useCycle()
+
+  const rolesAllowedToEdit = Users.getRolesAllowedToEdit({ user, countryIso, cycle })
+  return rolesAllowedToEdit.length > 0
+}
+
+/**
+ * React hook to determine whether given user has access to view user activities (eg. Messaging, Recent activity, etc.)
+ *
+ * @param user - The user
+ * @returns boolean indicating whether the user can view user activities
+ *
+ * @example
+ * const user = useUser();
+ * const canSeeActivities = useCanSeeUserActivities(user);
+ *
+ * if (!canSeeActivities) {
+ *   // Hide activities UI
+ * }
+ */
+export const useCanSeeUserActivities = (user: User) => {
+  const { countryIso } = useCountryRouteParams<CountryIso>()
+  const cycle = useCycle()
+
+  return Authorizer.canViewUsers({ countryIso, cycle, user })
+}
diff --git a/src/client/store/user/index.ts b/src/client/store/user/index.ts
index 6efa6ee570..27b1b50eef 100644
--- a/src/client/store/user/index.ts
+++ b/src/client/store/user/index.ts
@@ -1,6 +1,7 @@
 export {
   useCanEdit,
   useCanEditCycleData,
+  useCanSeeUserActivities,
   useIsCountryRepositoryEditable,
   useIsEditTableDataEnabled,
   useIsGlobalRepositoryEditable,
diff --git a/src/client/style/_partials/_config.scss b/src/client/style/_partials/_config.scss
index c7adcbb786..ebff3eef78 100644
--- a/src/client/style/_partials/_config.scss
+++ b/src/client/style/_partials/_config.scss
@@ -23,6 +23,7 @@ $ui-border: #dadada;
 $ui-border-light: lighten($ui-border, 8%);
 $ui-border-dark: darken($ui-border, 8%);
 $ui-bg: #f5f5f5;
+$ui-bg-light: #fbfafa;
 $ui-bg-hover: #ebebeb;
 $ui-accent: #1798a5;
 $ui-accent-dark: darken($ui-accent, 10%);
diff --git a/src/i18n/resources/ar.ts b/src/i18n/resources/ar.ts
index 5a77b78a8e..aaaa638a16 100644
--- a/src/i18n/resources/ar.ts
+++ b/src/i18n/resources/ar.ts
@@ -18,6 +18,7 @@ import * as nationalDataPoint from './ar/nationalDataPoint.json'
 import * as other from './ar/other.json'
 import * as statisticalFactsheets from './ar/statisticalFactsheets.json'
 import * as uc from './ar/uc.json'
+import * as user from './ar/user.json'
 
 export const arTranslation = {
   admin,
@@ -36,13 +37,9 @@ export const arTranslation = {
   landing,
   login,
   nationalDataPoint,
-
-  page: {
-    assessmentSection,
-  },
-
+  page: { assessmentSection },
   statisticalFactsheets,
   uc,
-
+  user,
   ...other,
 }
diff --git a/src/i18n/resources/ar/landing.json b/src/i18n/resources/ar/landing.json
index 7760c2f2fe..0fb0fcc9d5 100644
--- a/src/i18n/resources/ar/landing.json
+++ b/src/i18n/resources/ar/landing.json
@@ -72,6 +72,7 @@
   },
   "sections": {
     "about": "نبذة عن تقييم الموارد الحرجية",
+    "collaborators": "$t(user.roles.COLLABORATOR, {\"count\":10})",
     "contentCheck": "المحتوى / التحقق",
     "externalData": "بيانات خارجية",
     "messageBoard": "لوح الرسائل",
diff --git a/src/i18n/resources/ar/other.json b/src/i18n/resources/ar/other.json
index 71f122ad49..fa694e48fc 100644
--- a/src/i18n/resources/ar/other.json
+++ b/src/i18n/resources/ar/other.json
@@ -643,26 +643,6 @@
     "thousandPersons": "1000 شخص",
     "tonnesPerHa": "طن/هـ"
   },
-  "user": {
-    "resetPasswordEmail": {
-      "htmlMessage": "عزيزي {{user}}\n<br/><br/>\nتلقينا طلباً بإعادة ضبط كلمة المرور إلى حساب تقييم الموارد الحرجية الخاص بك. \n<br/>\nإن لم تقدم هذا الطلب، يمكنك تجاهل هذه الرسالة بأمان.\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">Click here to reset your password</a>\n<br/><br/><br/>\nThanks,\n<br/>\nفريق تقييم الموارد الحرجية fra@fao.org\n<br/>\n{{- url}}\n      ",
-      "subject": "منصة تقييم الموارد الحرجية، إعادة ضبط كلمة المرور",
-      "textMessage": "عزيزي {{user}}\n\nتلقينا طلباً بإعادة ضبط كلمة المرور إلى حساب تقييم الموارد الحرجية الخاص بك. إذا لم تقدم هذا الطلب يمكنك تجاهل هذه الرسالة بأمان.\nانقر على الرابط التالي لإعادة ضبط كلمة المرور{{- link}}\n\nClick the following link to reset your password\n{{- link}}\n\n\nشكراً\nفريق تقييم الموارد الحرجية fra@fao.org\n{{- url}}"
-    },
-    "roles": {
-      "ADMINISTRATOR": "مدير",
-      "ALTERNATE_NATIONAL_CORRESPONDENT": "مراسل وطني بديل",
-      "COLLABORATOR": "متعاون",
-      "NATIONAL_CORRESPONDENT": "مراسل وطني",
-      "REVIEWER": "مُراجع",
-      "VIEWER": "مشاهد",
-      "alternateNationalCorrespondent_plural": "المراسلون الوطنيون المناوبون",
-      "collaborator_plural": "المتعاونين",
-      "nationalCorrespondent_plural": "المراسلون الوطنيون",
-      "noRole": "",
-      "reviewer_plural": "المراجعين"
-    }
-  },
   "userChat": {
     "cancel": "إلغاء",
     "chatHeader": "رسائل مع {{user}}",
diff --git a/src/i18n/resources/ar/user.json b/src/i18n/resources/ar/user.json
new file mode 100644
index 0000000000..68e7f2318c
--- /dev/null
+++ b/src/i18n/resources/ar/user.json
@@ -0,0 +1,20 @@
+{
+  "resetPasswordEmail": {
+    "htmlMessage": "عزيزي {{user}}\n<br/><br/>\nتلقينا طلباً بإعادة ضبط كلمة المرور إلى حساب تقييم الموارد الحرجية الخاص بك. \n<br/>\nإن لم تقدم هذا الطلب، يمكنك تجاهل هذه الرسالة بأمان.\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">Click here to reset your password</a>\n<br/><br/><br/>\nThanks,\n<br/>\nفريق تقييم الموارد الحرجية fra@fao.org\n<br/>\n{{- url}}\n      ",
+    "subject": "منصة تقييم الموارد الحرجية، إعادة ضبط كلمة المرور",
+    "textMessage": "عزيزي {{user}}\n\nتلقينا طلباً بإعادة ضبط كلمة المرور إلى حساب تقييم الموارد الحرجية الخاص بك. إذا لم تقدم هذا الطلب يمكنك تجاهل هذه الرسالة بأمان.\nانقر على الرابط التالي لإعادة ضبط كلمة المرور{{- link}}\n\nClick the following link to reset your password\n{{- link}}\n\n\nشكراً\nفريق تقييم الموارد الحرجية fra@fao.org\n{{- url}}"
+  },
+  "roles": {
+    "ADMINISTRATOR": "مدير",
+    "ALTERNATE_NATIONAL_CORRESPONDENT": "مراسل وطني بديل",
+    "ALTERNATE_NATIONAL_CORRESPONDENT_other": "المراسلون الوطنيون المناوبون",
+    "COLLABORATOR": "متعاون",
+    "NATIONAL_CORRESPONDENT": "مراسل وطني",
+    "NATIONAL_CORRESPONDENT_other": "المراسلون الوطنيون",
+    "REVIEWER": "مُراجع",
+    "REVIEWER_plural": "المراجعين",
+    "VIEWER": "مشاهد",
+    "COLLABORATOR_other": "المتعاونين",
+    "noRole": ""
+  }
+}
diff --git a/src/i18n/resources/en.ts b/src/i18n/resources/en.ts
index 006ab067ca..860d7eb395 100644
--- a/src/i18n/resources/en.ts
+++ b/src/i18n/resources/en.ts
@@ -19,6 +19,7 @@ import * as other from './en/other.json'
 import * as panEuropean from './en/panEuropean/panEuropean.json'
 import * as statisticalFactsheets from './en/statisticalFactsheets.json'
 import * as uc from './en/uc.json'
+import * as user from './en/user.json'
 import * as validation from './en/validation.json'
 
 export const enTranslation = {
@@ -38,15 +39,11 @@ export const enTranslation = {
   landing,
   login,
   nationalDataPoint,
-
-  page: {
-    assessmentSection,
-  },
-
+  page: { assessmentSection },
   panEuropean,
   statisticalFactsheets,
   uc,
+  user,
   validation,
-
   ...other,
 }
diff --git a/src/i18n/resources/en/admin.json b/src/i18n/resources/en/admin.json
index f2d6c7f3dd..3dd1acd732 100644
--- a/src/i18n/resources/en/admin.json
+++ b/src/i18n/resources/en/admin.json
@@ -2,6 +2,7 @@
   "admin": "Admin",
   "country_one": "{{count}} Country",
   "country_other": "{{count}} Countries",
+  "disabledUsers": "Disabled Users",
   "enotfound": "DNS error",
   "filter": "Filter by",
   "invitationPending": "Invitation pending",
diff --git a/src/i18n/resources/en/common.json b/src/i18n/resources/en/common.json
index 6fb164fffd..33dd968937 100644
--- a/src/i18n/resources/en/common.json
+++ b/src/i18n/resources/en/common.json
@@ -10,9 +10,11 @@
   "calculate": "Calculate",
   "cancel": "Cancel",
   "clearTable": "Clear table",
+  "collaborators": "Collaborators",
   "column": "Column",
   "continue": "Continue",
   "copyToClipboard": "Copy to clipboard",
+  "copyLink": "Copy link",
   "countries": "Countries",
   "country": "Country",
   "custom": "Custom",
@@ -30,6 +32,7 @@
   "globalFRA": "Global Forest Resources Assessment",
   "hide": "Hide",
   "invitations": "Invitations",
+  "inviteAgain": "Invite again",
   "invited": "Invited",
   "issues": "Issues",
   "label": "Label",
@@ -45,10 +48,12 @@
   "or": "Or",
   "other": "Other",
   "otherSpecifyInComments": "Other (specify in comments)",
+  "pending": "Pending",
   "plusCountMore": "+{{count}} More",
   "private": "Private",
   "public": "Public",
   "regions": "Regions",
+  "remove": "Remove",
   "resetAll": "Reset all",
   "role": "Role",
   "select": "Select",
diff --git a/src/i18n/resources/en/landing.json b/src/i18n/resources/en/landing.json
index 96147b4065..f56438ddcd 100644
--- a/src/i18n/resources/en/landing.json
+++ b/src/i18n/resources/en/landing.json
@@ -72,13 +72,14 @@
   },
   "sections": {
     "about": "About FRA",
+    "collaborators": "$t(user.roles.COLLABORATOR, {\"count\":10})",
     "contentCheck": "Content / Check",
     "externalData": "External data",
     "messageBoard": "Message board",
     "overview": "Overview",
     "recentActivity": "Recent activity",
     "repository": "Links & Repository",
-    "userManagement": "Manage collaborators",
+    "userManagement": "Manage Collaborators",
     "versioning": "Versioning"
   },
   "users": {
diff --git a/src/i18n/resources/en/other.json b/src/i18n/resources/en/other.json
index dcc32093af..3c8a9a2ea4 100644
--- a/src/i18n/resources/en/other.json
+++ b/src/i18n/resources/en/other.json
@@ -643,26 +643,6 @@
     "thousandPersons": "1 000 persons",
     "tonnesPerHa": "tonnes/ha"
   },
-  "user": {
-    "resetPasswordEmail": {
-      "htmlMessage": "Dear {{user}}\n<br/><br/>\nWe have received a request to reset your password for your FRA account. \n<br/>\nIf you didn't make this request, you can safely ignore this email.\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">Click here to reset your password</a>\n<br/><br/><br/>\nThanks,\n<br/>\nThe FRA team fra@fao.org\n<br/>\n{{- url}}\n      ",
-      "subject": "FRA platform - Reset password",
-      "textMessage": "Dear {{user}}\n\nWe have received a request to reset your password for your FRA account. \nIf you didn't make this request, you can safely ignore this email.\n\nClick the following link to reset your password\n{{- link}}\n\n\nThanks,\nThe FRA team fra@fao.org\n{{- url}}"
-    },
-    "roles": {
-      "ADMINISTRATOR": "Administrator",
-      "ALTERNATE_NATIONAL_CORRESPONDENT": "Alternate national correspondent",
-      "COLLABORATOR": "Collaborator",
-      "NATIONAL_CORRESPONDENT": "National correspondent",
-      "REVIEWER": "Reviewer",
-      "VIEWER": "Viewer",
-      "alternateNationalCorrespondent_plural": "Alternate national correspondents",
-      "collaborator_plural": "Collaborators",
-      "nationalCorrespondent_plural": "National correspondents",
-      "noRole": "",
-      "reviewer_plural": "Reviewers"
-    }
-  },
   "userChat": {
     "cancel": "Cancel",
     "chatHeader": "Messages with {{user}}",
diff --git a/src/i18n/resources/en/panEuropean/panEuropean.json b/src/i18n/resources/en/panEuropean/panEuropean.json
index 19699590fe..8d55afa08c 100644
--- a/src/i18n/resources/en/panEuropean/panEuropean.json
+++ b/src/i18n/resources/en/panEuropean/panEuropean.json
@@ -1,25 +1,5 @@
 {
-  "2020": {
-    "description": {
-      "dataSource": {
-        "comments": "$t(dataSource.comments)",
-        "referenceToTataSource": "Name and Reference to data source",
-        "typeOfDataSource": "$t(dataSource.typeOfDataSource)",
-        "variable": "$t(dataSource.variable)",
-        "yearForDataSource": "$t(dataSource.yearForDataSource)"
-      }
-    }
-  },
   "2025": {
-    "description": {
-      "dataSource": {
-        "comments": "$t(dataSource.comments)",
-        "referenceToTataSource": "Name and Reference to data source",
-        "typeOfDataSource": "$t(dataSource.typeOfDataSource)",
-        "variable": "$t(dataSource.variable)",
-        "yearForDataSource": "$t(dataSource.yearForDataSource)"
-      }
-    },
     "meta": {
       "select": {
         "facilityCategory": {
@@ -480,6 +460,15 @@
     "volumeOfDeadwoodInFOWLBySpeciesGroups": "Volume of deadwood in FOWL by species groups",
     "volumeOfDeadwoodM3Ha": "Volume of deadwood (m³/ha)"
   },
+  "description": {
+    "dataSource": {
+      "comments": "$t(dataSource.comments)",
+      "referenceToTataSource": "Name and Reference to data source",
+      "typeOfDataSource": "$t(dataSource.typeOfDataSource)",
+      "variable": "$t(dataSource.variable)",
+      "yearForDataSource": "$t(dataSource.yearForDataSource)"
+    }
+  },
   "diameterDistributionAndTotalAreaUnevenAgedStands": {
     "_21_40_cm": "21-40 cm",
     "_41_60_cm": "41-60 cm",
diff --git a/src/i18n/resources/en/user.json b/src/i18n/resources/en/user.json
new file mode 100644
index 0000000000..2599a2ca63
--- /dev/null
+++ b/src/i18n/resources/en/user.json
@@ -0,0 +1,22 @@
+{
+  "resetPasswordEmail": {
+    "htmlMessage": "Dear {{user}}\n<br/><br/>\nWe have received a request to reset your password for your FRA account. \n<br/>\nIf you didn't make this request, you can safely ignore this email.\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">Click here to reset your password</a>\n<br/><br/><br/>\nThanks,\n<br/>\nThe FRA team fra@fao.org\n<br/>\n{{- url}}\n      ",
+    "subject": "FRA platform - Reset password",
+    "textMessage": "Dear {{user}}\n\nWe have received a request to reset your password for your FRA account. \nIf you didn't make this request, you can safely ignore this email.\n\nClick the following link to reset your password\n{{- link}}\n\n\nThanks,\nThe FRA team fra@fao.org\n{{- url}}"
+  },
+  "roles": {
+    "ADMINISTRATOR": "Administrator",
+    "ADMINISTRATOR_other": "Administrators",
+    "ALTERNATE_NATIONAL_CORRESPONDENT": "Alternate national correspondent",
+    "ALTERNATE_NATIONAL_CORRESPONDENT_other": "Alternate national correspondents",
+    "COLLABORATOR": "Collaborator",
+    "COLLABORATOR_other": "Collaborators",
+    "NATIONAL_CORRESPONDENT": "National correspondent",
+    "NATIONAL_CORRESPONDENT_other": "National correspondents",
+    "REVIEWER": "Reviewer",
+    "REVIEWER_other": "Reviewers",
+    "VIEWER": "Viewer",
+    "VIEWER_other": "Viewers",
+    "noRole": ""
+  }
+}
diff --git a/src/i18n/resources/es.ts b/src/i18n/resources/es.ts
index b13abd3ca8..aa05cb8579 100644
--- a/src/i18n/resources/es.ts
+++ b/src/i18n/resources/es.ts
@@ -16,6 +16,7 @@ import * as nationalDataPoint from './es/nationalDataPoint.json'
 import * as other from './es/other.json'
 import * as statisticalFactsheets from './es/statisticalFactsheets.json'
 import * as uc from './es/uc.json'
+import * as user from './es/user.json'
 
 export const esTranslation = {
   admin,
@@ -32,13 +33,9 @@ export const esTranslation = {
   landing,
   login,
   nationalDataPoint,
-
-  page: {
-    assessmentSection,
-  },
-
+  page: { assessmentSection },
   statisticalFactsheets,
   uc,
-
+  user,
   ...other,
 }
diff --git a/src/i18n/resources/es/landing.json b/src/i18n/resources/es/landing.json
index af4d85f0cd..125e49395e 100644
--- a/src/i18n/resources/es/landing.json
+++ b/src/i18n/resources/es/landing.json
@@ -72,6 +72,7 @@
   },
   "sections": {
     "about": "Acerca de FRA",
+    "collaborators": "$t(user.roles.COLLABORATOR, {\"count\":10})",
     "contentCheck": "Contenido / Comprobar",
     "externalData": "Datos externos",
     "messageBoard": "Tablero de mensajes",
diff --git a/src/i18n/resources/es/other.json b/src/i18n/resources/es/other.json
index 967b944044..bd9493200a 100644
--- a/src/i18n/resources/es/other.json
+++ b/src/i18n/resources/es/other.json
@@ -643,26 +643,6 @@
     "thousandPersons": "1 000 personas",
     "tonnesPerHa": "toneladas / ha"
   },
-  "user": {
-    "resetPasswordEmail": {
-      "htmlMessage": "Estimado/a {{user}}\n<br/><br/>\nHemos recibido una solicitud para restablecer la contraseña de su cuenta de FRA. \n<br/>\nSi no ha realizado esta solicitud, puede ignorar este correo electrónico.\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">Haga clic aquí para restablecer su contraseña</a>\n<br/><br/><br/>\nGracias,\n<br/>\nEl equipo de FRA fra@fao. rg\n<br/>\n{{- url}}\n      ",
-      "subject": "Plataforma FRA - Restablecer contraseña",
-      "textMessage": "Estimado/a {{user}}\n\nHemos recibido una solicitud para restablecer la contraseña de su cuenta de FRA.\nSi usted no hizo esta solicitud, puede ignorar este correo electrónico.\n\nHaga clic en el siguiente enlace para restablecer su contraseña:\n{{- link}}\n\nGracias,\nEl equipo de FRA fra@fao.org\n{{- url}}"
-    },
-    "roles": {
-      "ADMINISTRATOR": "Administrador",
-      "ALTERNATE_NATIONAL_CORRESPONDENT": "Corresponsal Nacional alterno",
-      "COLLABORATOR": "Colaborador",
-      "NATIONAL_CORRESPONDENT": "Corresponsal Nacional",
-      "REVIEWER": "Evaluador",
-      "VIEWER": "Observador",
-      "alternateNationalCorrespondent_plural": "Corresponsales nacionales suplentes",
-      "collaborator_plural": "Colaboradores",
-      "nationalCorrespondent_plural": "Corresponsales nacionales",
-      "noRole": "",
-      "reviewer_plural": "Revisores"
-    }
-  },
   "userChat": {
     "cancel": "Cancelar",
     "chatHeader": "Mensajes con {{user}}",
diff --git a/src/i18n/resources/es/user.json b/src/i18n/resources/es/user.json
new file mode 100644
index 0000000000..aa237dbaff
--- /dev/null
+++ b/src/i18n/resources/es/user.json
@@ -0,0 +1,21 @@
+{
+  "resetPasswordEmail": {
+    "htmlMessage": "Estimado/a {{user}}\n<br/><br/>\nHemos recibido una solicitud para restablecer la contraseña de su cuenta de FRA. \n<br/>\nSi no ha realizado esta solicitud, puede ignorar este correo electrónico.\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">Haga clic aquí para restablecer su contraseña</a>\n<br/><br/><br/>\nGracias,\n<br/>\nEl equipo de FRA fra@fao. rg\n<br/>\n{{- url}}\n      ",
+    "subject": "Plataforma FRA - Restablecer contraseña",
+    "textMessage": "Estimado/a {{user}}\n\nHemos recibido una solicitud para restablecer la contraseña de su cuenta de FRA.\nSi usted no hizo esta solicitud, puede ignorar este correo electrónico.\n\nHaga clic en el siguiente enlace para restablecer su contraseña:\n{{- link}}\n\nGracias,\nEl equipo de FRA fra@fao.org\n{{- url}}"
+  },
+  "roles": {
+    "ADMINISTRATOR": "Administrador",
+    "ALTERNATE_NATIONAL_CORRESPONDENT": "Corresponsal Nacional alterno",
+    "ALTERNATE_NATIONAL_CORRESPONDENT_other": "Corresponsales nacionales suplentes",
+    "COLLABORATOR": "Colaborador",
+    "COLLABORATOR_other": "Colaboradores",
+    "NATIONAL_CORRESPONDENT": "Corresponsal Nacional",
+    "NATIONAL_CORRESPONDENT_other": "Corresponsales nacionales",
+    "REVIEWER": "Evaluador",
+    "REVIEWER_other": "Revisores",
+    "VIEWER": "Observador",
+    "VIEWER_other": "Observadores",
+    "noRole": ""
+  }
+}
diff --git a/src/i18n/resources/fr.ts b/src/i18n/resources/fr.ts
index 3bce1a48b7..f06f5da64a 100644
--- a/src/i18n/resources/fr.ts
+++ b/src/i18n/resources/fr.ts
@@ -17,6 +17,7 @@ import * as nationalDataPoint from './fr/nationalDataPoint.json'
 import * as other from './fr/other.json'
 import * as statisticalFactsheets from './fr/statisticalFactsheets.json'
 import * as uc from './fr/uc.json'
+import * as user from './fr/user.json'
 
 export const frTranslation = {
   admin,
@@ -34,13 +35,9 @@ export const frTranslation = {
   landing,
   login,
   nationalDataPoint,
-
-  page: {
-    assessmentSection,
-  },
-
+  page: { assessmentSection },
   statisticalFactsheets,
   uc,
-
+  user,
   ...other,
 }
diff --git a/src/i18n/resources/fr/landing.json b/src/i18n/resources/fr/landing.json
index c0b1287c90..1731e5f68a 100644
--- a/src/i18n/resources/fr/landing.json
+++ b/src/i18n/resources/fr/landing.json
@@ -72,6 +72,7 @@
   },
   "sections": {
     "about": "À propos de FRA",
+    "collaborators": "$t(user.roles.COLLABORATOR, {\"count\":10})",
     "contentCheck": "Contenu / Vérification",
     "externalData": "Données externes",
     "messageBoard": "Panneau d'affichage",
diff --git a/src/i18n/resources/fr/other.json b/src/i18n/resources/fr/other.json
index 17b6f68fc8..cb7b51e54b 100644
--- a/src/i18n/resources/fr/other.json
+++ b/src/i18n/resources/fr/other.json
@@ -643,26 +643,6 @@
     "thousandPersons": "1 000 personnes",
     "tonnesPerHa": "tonnes / ha"
   },
-  "user": {
-    "resetPasswordEmail": {
-      "htmlMessage": "Cher/Chère {{user}}\n<br/><br/>\nNous avons reçu une demande pour réinitialiser votre mot de passe pour votre compte FRA.\n<br/>\nSi vous n'avez pas effectué cette demande, vous pouvez ignorer cet e-mail en toute sécurité.\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">Cliquez ici pour réinitialiser votre mot de passe</a>\n<br/><br/><br/>\nMerci,\n<br/>\nL'équipe FRA fra@fao.org\n<br/>\n{{- url}}\n      ",
-      "subject": "Plateforme FRA - Réinitialiser le mot de passe",
-      "textMessage": "Cher/Chère {{user}}\n\nNous avons reçu une demande pour réinitialiser votre mot de passe pour votre compte FRA.\nSi vous n'avez pas effectué cette demande, vous pouvez ignorer cet e-mail en toute sécurité.\n\nCliquez ici pour réinitialiser votre mot de passe\n{{- link}}\n\nMerci,\nL'équipe FRA fra@fao.org\n{{- url}}"
-    },
-    "roles": {
-      "ADMINISTRATOR": "Administrateur",
-      "ALTERNATE_NATIONAL_CORRESPONDENT": "Correspondant national suppléant",
-      "COLLABORATOR": "Collaborateur",
-      "NATIONAL_CORRESPONDENT": "Correspondant national",
-      "REVIEWER": "Examinateur",
-      "VIEWER": "Visionneur",
-      "alternateNationalCorrespondent_plural": "Correspondants nationaux suppléants",
-      "collaborator_plural": "Collaborateurs",
-      "nationalCorrespondent_plural": "Correspondants nationaux",
-      "noRole": "",
-      "reviewer_plural": "Examinateurs"
-    }
-  },
   "userChat": {
     "cancel": "Effacer",
     "chatHeader": "Échange de messages avec {{user}}",
diff --git a/src/i18n/resources/fr/user.json b/src/i18n/resources/fr/user.json
new file mode 100644
index 0000000000..2a48abec13
--- /dev/null
+++ b/src/i18n/resources/fr/user.json
@@ -0,0 +1,21 @@
+{
+  "resetPasswordEmail": {
+    "htmlMessage": "Cher/Chère {{user}}\n<br/><br/>\nNous avons reçu une demande pour réinitialiser votre mot de passe pour votre compte FRA.\n<br/>\nSi vous n'avez pas effectué cette demande, vous pouvez ignorer cet e-mail en toute sécurité.\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">Cliquez ici pour réinitialiser votre mot de passe</a>\n<br/><br/><br/>\nMerci,\n<br/>\nL'équipe FRA fra@fao.org\n<br/>\n{{- url}}\n      ",
+    "subject": "Plateforme FRA - Réinitialiser le mot de passe",
+    "textMessage": "Cher/Chère {{user}}\n\nNous avons reçu une demande pour réinitialiser votre mot de passe pour votre compte FRA.\nSi vous n'avez pas effectué cette demande, vous pouvez ignorer cet e-mail en toute sécurité.\n\nCliquez ici pour réinitialiser votre mot de passe\n{{- link}}\n\nMerci,\nL'équipe FRA fra@fao.org\n{{- url}}"
+  },
+  "roles": {
+    "ADMINISTRATOR": "Administrateur",
+    "ALTERNATE_NATIONAL_CORRESPONDENT": "Correspondant national suppléant",
+    "ALTERNATE_NATIONAL_CORRESPONDENT_other": "Correspondants nationaux suppléants",
+    "COLLABORATOR": "Collaborateur",
+    "COLLABORATOR_other": "Collaborateurs",
+    "NATIONAL_CORRESPONDENT": "Correspondant national",
+    "NATIONAL_CORRESPONDENT_other": "Correspondants nationaux",
+    "REVIEWER": "Examinateur",
+    "REVIEWER_other": "Examinateurs",
+    "VIEWER": "Visionneur",
+    "VIEWER_other": "Visionneurs",
+    "noRole": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/resources/ru.ts b/src/i18n/resources/ru.ts
index 4e4fb6fd45..f464f72582 100644
--- a/src/i18n/resources/ru.ts
+++ b/src/i18n/resources/ru.ts
@@ -17,6 +17,7 @@ import * as nationalDataPoint from './ru/nationalDataPoint.json'
 import * as other from './ru/other.json'
 import * as statisticalFactsheets from './ru/statisticalFactsheets.json'
 import * as uc from './ru/uc.json'
+import * as user from './ru/user.json'
 
 export const ruTranslation = {
   admin,
@@ -34,13 +35,9 @@ export const ruTranslation = {
   landing,
   login,
   nationalDataPoint,
-
-  page: {
-    assessmentSection,
-  },
-
+  page: { assessmentSection },
   statisticalFactsheets,
   uc,
-
+  user,
   ...other,
 }
diff --git a/src/i18n/resources/ru/landing.json b/src/i18n/resources/ru/landing.json
index 0c3625e479..5fee59d408 100644
--- a/src/i18n/resources/ru/landing.json
+++ b/src/i18n/resources/ru/landing.json
@@ -72,6 +72,7 @@
   },
   "sections": {
     "about": "Информация об ОЛР",
+    "collaborators": "$t(user.roles.COLLABORATOR, {\"count\":10})",
     "contentCheck": "Содержание / проверка",
     "externalData": "Внешние данные",
     "messageBoard": "Доска сообщений",
diff --git a/src/i18n/resources/ru/other.json b/src/i18n/resources/ru/other.json
index 155e292341..1d08c81642 100644
--- a/src/i18n/resources/ru/other.json
+++ b/src/i18n/resources/ru/other.json
@@ -643,26 +643,6 @@
     "thousandPersons": "1 000 человек",
     "tonnesPerHa": "тонн/га"
   },
-  "user": {
-    "resetPasswordEmail": {
-      "htmlMessage": "Уважаемый (ая)  {{user}}\n<br/><br/>\nМы получили запрос на сброс пароля для вашей учетной записи в FRA. \n<br/>\nЕсли вы не делали этого запроса, вы можете проигнорировать это письмо.\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">Нажмите здесь, чтобы сбросить свой пароль</a>\n<br/><br/><br/>\nСпасибо,\n<br/>\nГруппа по ОЛР fra@fao.org\n<br/>\n{{- url}}\n      ",
-      "subject": "Платформа ОЛР - сменить пароль",
-      "textMessage": "Уважаемый (ая)  {{user}}\n\nМы получили запрос на сброс пароля для вашей учетной записи в FRA. \nЕсли вы не делали этого запроса, вы можете проигнорировать это письмо.\n\nНажмите здесь, чтобы сбросить свой пароль\n{{- link}}\n\n\nСпасибо,\nГруппа по ОЛР fra@fao.org\n{{- url}}"
-    },
-    "roles": {
-      "ADMINISTRATOR": "Администратор",
-      "ALTERNATE_NATIONAL_CORRESPONDENT": "Помощник национального корреспондента",
-      "COLLABORATOR": "Сотрудник",
-      "NATIONAL_CORRESPONDENT": "Национальный корреспондент",
-      "REVIEWER": "Рецензент",
-      "VIEWER": "Наблюдатель",
-      "alternateNationalCorrespondent_plural": "Заместители национального корреспондента",
-      "collaborator_plural": "Сотрудники",
-      "nationalCorrespondent_plural": "Национальные корреспонденты",
-      "noRole": "",
-      "reviewer_plural": "Рецензенты"
-    }
-  },
   "userChat": {
     "cancel": "Отмена",
     "chatHeader": "Сообщения от {{user}}",
diff --git a/src/i18n/resources/ru/user.json b/src/i18n/resources/ru/user.json
new file mode 100644
index 0000000000..1834a00fbb
--- /dev/null
+++ b/src/i18n/resources/ru/user.json
@@ -0,0 +1,20 @@
+{
+  "resetPasswordEmail": {
+    "htmlMessage": "Уважаемый (ая)  {{user}}\n<br/><br/>\nМы получили запрос на сброс пароля для вашей учетной записи в FRA. \n<br/>\nЕсли вы не делали этого запроса, вы можете проигнорировать это письмо.\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">Нажмите здесь, чтобы сбросить свой пароль</a>\n<br/><br/><br/>\nСпасибо,\n<br/>\nГруппа по ОЛР fra@fao.org\n<br/>\n{{- url}}\n      ",
+    "subject": "Платформа ОЛР - сменить пароль",
+    "textMessage": "Уважаемый (ая)  {{user}}\n\nМы получили запрос на сброс пароля для вашей учетной записи в FRA. \nЕсли вы не делали этого запроса, вы можете проигнорировать это письмо.\n\nНажмите здесь, чтобы сбросить свой пароль\n{{- link}}\n\n\nСпасибо,\nГруппа по ОЛР fra@fao.org\n{{- url}}"
+  },
+  "roles": {
+    "ADMINISTRATOR": "Администратор",
+    "ALTERNATE_NATIONAL_CORRESPONDENT": "Помощник национального корреспондента",
+    "ALTERNATE_NATIONAL_CORRESPONDENT_other": "Заместители национального корреспондента",
+    "COLLABORATOR": "Сотрудник",
+    "COLLABORATOR_other": "Сотрудники",
+    "NATIONAL_CORRESPONDENT": "Национальный корреспондент",
+    "NATIONAL_CORRESPONDENT_other": "Национальные корреспонденты",
+    "REVIEWER": "Рецензент",
+    "REVIEWER_other": "Рецензенты",
+    "VIEWER": "Наблюдатель",
+    "noRole": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/resources/zh.ts b/src/i18n/resources/zh.ts
index 4ec440cb1a..18fb767152 100644
--- a/src/i18n/resources/zh.ts
+++ b/src/i18n/resources/zh.ts
@@ -17,6 +17,7 @@ import * as nationalDataPoint from './zh/nationalDataPoint.json'
 import * as other from './zh/other.json'
 import * as statisticalFactsheets from './zh/statisticalFactsheets.json'
 import * as uc from './zh/uc.json'
+import * as user from './zh/user.json'
 
 export const zhTranslation = {
   admin,
@@ -34,13 +35,9 @@ export const zhTranslation = {
   landing,
   login,
   nationalDataPoint,
-
-  page: {
-    assessmentSection,
-  },
-
+  page: { assessmentSection },
   statisticalFactsheets,
   uc,
-
+  user,
   ...other,
 }
diff --git a/src/i18n/resources/zh/landing.json b/src/i18n/resources/zh/landing.json
index 58e8ba722b..22fa283524 100644
--- a/src/i18n/resources/zh/landing.json
+++ b/src/i18n/resources/zh/landing.json
@@ -72,6 +72,7 @@
   },
   "sections": {
     "about": "关于FRA",
+    "collaborators": "$t(user.roles.COLLABORATOR, {\"count\":10})",
     "contentCheck": "内容/检查",
     "externalData": "外部数据",
     "messageBoard": "留言板",
diff --git a/src/i18n/resources/zh/other.json b/src/i18n/resources/zh/other.json
index e0ccb1e75c..2bfc14bfc4 100644
--- a/src/i18n/resources/zh/other.json
+++ b/src/i18n/resources/zh/other.json
@@ -643,26 +643,6 @@
     "thousandPersons": "1 000 人",
     "tonnesPerHa": "吨/公顷"
   },
-  "user": {
-    "resetPasswordEmail": {
-      "htmlMessage": "尊敬的 {{user}}\n<br/><br/>\n我们收到了一个重置您FRA账户密码的请求。 \n<br/>\n如果您没有提出这一要求，请忽略这封邮件。\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">点击此处重设密码</a>\n<br/><br/><br/>\n谢谢！\n<br/>\nFRA工作组 fra@fao.org\n<br/>\n{{- url}}\n      ",
-      "subject": "FRA平台 - 重置密码",
-      "textMessage": "尊敬的 {{user}}\n\n我们收到了一个重置您FRA账户密码的请求。\n如果您没有提出这一要求，请忽略这封邮件。\n\n\n请点击以下链接重置您的密码\n{{- link}}\n\n\n谢谢！,\nFRA工作组 fra@fao.org\n{{- url}}"
-    },
-    "roles": {
-      "ADMINISTRATOR": "管理员",
-      "ALTERNATE_NATIONAL_CORRESPONDENT": "候补国家通讯员",
-      "COLLABORATOR": "合作者",
-      "NATIONAL_CORRESPONDENT": "国家通讯员",
-      "REVIEWER": "审核人",
-      "VIEWER": "观察者",
-      "alternateNationalCorrespondent_plural": "候补国家通讯员",
-      "collaborator_plural": "合作者",
-      "nationalCorrespondent_plural": "国家通讯员",
-      "noRole": "",
-      "reviewer_plural": "审查者"
-    }
-  },
   "userChat": {
     "cancel": "取消",
     "chatHeader": "与 {{user}}的消息",
diff --git a/src/i18n/resources/zh/user.json b/src/i18n/resources/zh/user.json
new file mode 100644
index 0000000000..f0f0e1440a
--- /dev/null
+++ b/src/i18n/resources/zh/user.json
@@ -0,0 +1,20 @@
+{
+  "resetPasswordEmail": {
+    "htmlMessage": "尊敬的 {{user}}\n<br/><br/>\n我们收到了一个重置您FRA账户密码的请求。 \n<br/>\n如果您没有提出这一要求，请忽略这封邮件。\n<br/><br/><br/>\n<a href=\"{{link}}\" style=\"text-decoration: none; background-color: #0098a6;border: 2px solid #00988F;color: white;font-size: 14px;font-weight: 700;    padding: 10px 50px;\">点击此处重设密码</a>\n<br/><br/><br/>\n谢谢！\n<br/>\nFRA工作组 fra@fao.org\n<br/>\n{{- url}}\n      ",
+    "subject": "FRA平台 - 重置密码",
+    "textMessage": "尊敬的 {{user}}\n\n我们收到了一个重置您FRA账户密码的请求。\n如果您没有提出这一要求，请忽略这封邮件。\n\n\n请点击以下链接重置您的密码\n{{- link}}\n\n\n谢谢！,\nFRA工作组 fra@fao.org\n{{- url}}"
+  },
+  "roles": {
+    "ADMINISTRATOR": "管理员",
+    "ALTERNATE_NATIONAL_CORRESPONDENT": "候补国家通讯员",
+    "ALTERNATE_NATIONAL_CORRESPONDENT_other": "候补国家通讯员",
+    "COLLABORATOR": "合作者",
+    "COLLABORATOR_other": "合作者",
+    "NATIONAL_CORRESPONDENT": "国家通讯员",
+    "NATIONAL_CORRESPONDENT_other": "国家通讯员",
+    "REVIEWER": "审核人",
+    "REVIEWER_other": "审查者",
+    "VIEWER": "观察者",
+    "noRole": ""
+  }
+}
diff --git a/src/meta/routes/routes.ts b/src/meta/routes/routes.ts
index edccfe8423..1fc7f19825 100644
--- a/src/meta/routes/routes.ts
+++ b/src/meta/routes/routes.ts
@@ -7,6 +7,7 @@ import {
   OriginalDataPointRouteParams,
   SectionRouteParams,
 } from 'meta/routes/routeParams'
+import { SectionNames } from 'meta/routes/sectionNames'
 
 import { createRoute } from './createRoute'
 import { LoginInvitationQueryParams, LoginQueryParams, LoginResetPasswordQueryParams } from './queryParams'
@@ -20,7 +21,7 @@ const Admin = createRoute<CycleRouteParams>({ path: 'admin', parent: Cycle })
 const AdminCountries = createRoute<CycleRouteParams>({ path: 'countries', parent: Admin })
 const AdminInvitations = createRoute<CycleRouteParams>({ path: 'invitations', parent: Admin })
 const AdminLinks = createRoute<CycleRouteParams>({ path: 'links', parent: Admin })
-const AdminUserManagement = createRoute<CycleRouteParams>({ path: 'userManagement', parent: Admin })
+const AdminCollaborators = createRoute<CycleRouteParams>({ path: SectionNames.Admin.collaborators, parent: Admin })
 const Tutorials = createRoute<CycleRouteParams>({ path: 'tutorials', parent: Cycle })
 
 // Country routes and sub routes
@@ -74,7 +75,7 @@ export const Routes = {
   AdminCountries,
   AdminInvitations,
   AdminLinks,
-  AdminUserManagement,
+  AdminCollaborators,
   Tutorials,
 
   // country
diff --git a/src/meta/routes/sectionNames.ts b/src/meta/routes/sectionNames.ts
index d32369a505..ac6c5e365b 100644
--- a/src/meta/routes/sectionNames.ts
+++ b/src/meta/routes/sectionNames.ts
@@ -2,14 +2,14 @@ enum AdminSectionNames {
   countries = 'countries',
   invitations = 'invitations',
   links = 'links',
-  userManagement = 'userManagement',
+  collaborators = 'collaborators',
 }
 
 enum CountryHomeSectionNames {
   overview = 'overview',
   messageBoard = 'messageBoard',
   // contentCheck = 'contentCheck',
-  userManagement = 'userManagement',
+  collaborators = 'collaborators',
   recentActivity = 'recentActivity',
   repository = 'repository',
 }
diff --git a/src/meta/tablePaginated/index.ts b/src/meta/tablePaginated/index.ts
index 45147e03e0..a25d3224eb 100644
--- a/src/meta/tablePaginated/index.ts
+++ b/src/meta/tablePaginated/index.ts
@@ -1,3 +1,4 @@
+export type { TablePaginatedCompareFn } from './sortFn'
 export type {
   TablePaginatedCount,
   TablePaginatedFilterValues,
diff --git a/src/meta/tablePaginated/sortFn.ts b/src/meta/tablePaginated/sortFn.ts
new file mode 100644
index 0000000000..6518ae280e
--- /dev/null
+++ b/src/meta/tablePaginated/sortFn.ts
@@ -0,0 +1 @@
+export type TablePaginatedCompareFn<Datum extends object> = (a: Datum, b: Datum) => number
diff --git a/src/meta/tablePaginated/tablePaginated.ts b/src/meta/tablePaginated/tablePaginated.ts
index ed49616767..14574d3568 100644
--- a/src/meta/tablePaginated/tablePaginated.ts
+++ b/src/meta/tablePaginated/tablePaginated.ts
@@ -29,4 +29,5 @@ export type UserFilters = {
   countries?: Array<CountryIso>
   fullName?: string
   roles?: Array<RoleName>
+  disabled?: boolean
 }
diff --git a/src/meta/tablePaginated/tablePaginateds.ts b/src/meta/tablePaginated/tablePaginateds.ts
index a6b674fcd6..790a0b5467 100644
--- a/src/meta/tablePaginated/tablePaginateds.ts
+++ b/src/meta/tablePaginated/tablePaginateds.ts
@@ -2,15 +2,15 @@ import { Objects } from 'utils/objects'
 
 import { TablePaginatedFilterValues } from 'meta/tablePaginated'
 
-type Returned = Record<string, TablePaginatedFilterValues>
+type FiltersBase = Record<string, TablePaginatedFilterValues>
 
-const encodeFilters = (filters: Returned): string | undefined => {
+const encodeFilters = <Filters = FiltersBase>(filters: Filters): string | undefined => {
   if (Objects.isEmpty(filters)) return undefined
   return encodeURIComponent(JSON.stringify(filters))
 }
 
-const decodeFilters = (encodedFilters: string | undefined): Returned | undefined => {
-  if (Objects.isEmpty(encodedFilters)) return undefined
+const decodeFilters = <Filters = FiltersBase>(encodedFilters: string | undefined): Filters => {
+  if (Objects.isEmpty(encodedFilters)) return {} as Filters
   const decodedFiltersString = decodeURIComponent(encodedFilters)
   return JSON.parse(decodedFiltersString)
 }
diff --git a/src/meta/user/authorizer/canEditUser.ts b/src/meta/user/authorizer/canEditUser.ts
new file mode 100644
index 0000000000..b70f15a247
--- /dev/null
+++ b/src/meta/user/authorizer/canEditUser.ts
@@ -0,0 +1,25 @@
+import { CountryIso } from 'meta/area'
+import { Cycle } from 'meta/assessment'
+import { User } from 'meta/user/user'
+import { Users } from 'meta/user/users'
+
+type Props = { countryIso: CountryIso; cycle: Cycle; user: User; target: User }
+
+export const canEditUserRole = (props: Props) => {
+  const { countryIso, cycle, user, target } = props
+
+  if (Users.isAdministrator(user)) return true
+  if (user.id === target.id) return false
+
+  const rolesAllowedToEdit = Users.getRolesAllowedToEdit({ user, countryIso, cycle })
+  return rolesAllowedToEdit.includes(Users.getRole(target, countryIso, cycle)?.role)
+}
+
+export const canEditUser = (props: Props) => {
+  const { user, target } = props
+
+  if (Users.isAdministrator(user)) return true
+  if (user.id === target.id) return true
+
+  return canEditUserRole(props)
+}
diff --git a/src/meta/user/authorizer/index.ts b/src/meta/user/authorizer/index.ts
index 3b187897a0..2895c91469 100644
--- a/src/meta/user/authorizer/index.ts
+++ b/src/meta/user/authorizer/index.ts
@@ -7,6 +7,7 @@ import { User } from 'meta/user/user'
 import { Collaborator, CollaboratorEditPropertyType } from 'meta/user/userRole'
 import { Users } from 'meta/user/users'
 
+import { canEditUser, canEditUserRole } from './canEditUser'
 import { canViewReview } from './canViewReview'
 
 /**
@@ -224,5 +225,8 @@ export const Authorizer = {
   canViewHistory,
   canViewRepositoryItem,
   canViewReview,
+  // user
   canViewUsers,
+  canEditUser,
+  canEditUserRole,
 }
diff --git a/src/meta/user/countryUserSummaries.ts b/src/meta/user/countryUserSummaries.ts
new file mode 100644
index 0000000000..a69e48544e
--- /dev/null
+++ b/src/meta/user/countryUserSummaries.ts
@@ -0,0 +1,32 @@
+import { CountryIso } from 'meta/area'
+import { CountryUserSummary } from 'meta/user/countryUserSummary'
+import { UserInvitation } from 'meta/user/userInvitation'
+import { RoleName, UserRole } from 'meta/user/userRole'
+
+const getCountryRoleAndInvitation = (
+  countryUserSummary: CountryUserSummary,
+  countryIso: CountryIso
+): { role?: UserRole<RoleName>; invitation?: UserInvitation } => {
+  const f = (role: UserRole<RoleName> | UserInvitation) => role.countryIso === countryIso
+  return {
+    role: countryUserSummary.roles.find(f),
+    invitation: countryUserSummary.invitations.find(f),
+  }
+}
+
+const getRoleName = (countryUserSummary: CountryUserSummary, countryIso: CountryIso): RoleName | undefined => {
+  const { invitation, role } = getCountryRoleAndInvitation(countryUserSummary, countryIso)
+  return invitation?.role ?? role?.role
+}
+
+const isInvitation = (countryUserSummary: CountryUserSummary, countryIso: CountryIso) => {
+  const { role, invitation } = getCountryRoleAndInvitation(countryUserSummary, countryIso)
+
+  return Boolean(!role && invitation)
+}
+
+export const CountryUserSummaries = {
+  getCountryRoleAndInvitation,
+  getRoleName,
+  isInvitation,
+}
diff --git a/src/meta/user/countryUserSummary.ts b/src/meta/user/countryUserSummary.ts
new file mode 100644
index 0000000000..87e9a78056
--- /dev/null
+++ b/src/meta/user/countryUserSummary.ts
@@ -0,0 +1,9 @@
+import { Lang } from 'meta/lang'
+import { User } from 'meta/user/user'
+import { UserInvitation } from 'meta/user/userInvitation'
+
+export type CountryUserSummary = User & {
+  readonly fullName: string
+  readonly lang: Lang
+  readonly invitations: Array<UserInvitation>
+}
diff --git a/src/meta/user/index.ts b/src/meta/user/index.ts
index 825a5f17f1..79476bf54d 100644
--- a/src/meta/user/index.ts
+++ b/src/meta/user/index.ts
@@ -1,8 +1,11 @@
 export { Authorizer } from './authorizer'
+export type { CountryUserSummary } from './countryUserSummary'
 export type { User } from './user'
 export { UserStatus, UserTitle } from './user'
 export type { UserAuthProvider } from './userAuth'
 export { AuthProvider } from './userAuth'
+export type { UserInvitation } from './userInvitation'
+export { UserInvitations } from './userInvitations'
 export type { UserInvitationSummary } from './userInvitationSummary'
 export type { UserResetPassword } from './userResetPassword'
 export type {
diff --git a/src/meta/user/userInvitation.ts b/src/meta/user/userInvitation.ts
new file mode 100644
index 0000000000..2bf09b7f2d
--- /dev/null
+++ b/src/meta/user/userInvitation.ts
@@ -0,0 +1,16 @@
+import { CountryIso } from 'meta/area'
+import { RoleName } from 'meta/user/userRole'
+
+export interface UserInvitation {
+  acceptedAt?: string
+  assessmentUuid: string
+  countryIso: CountryIso
+  cycleUuid: string
+  id: number
+  invitedAt: string
+  invitedByUserUuid: string
+  props: never // default {}
+  role: RoleName
+  userUuid: string
+  uuid: string
+}
diff --git a/src/meta/user/userInvitationSummary.ts b/src/meta/user/userInvitationSummary.ts
index fcf34c641d..952d38026b 100644
--- a/src/meta/user/userInvitationSummary.ts
+++ b/src/meta/user/userInvitationSummary.ts
@@ -1,3 +1,8 @@
-import { RoleName, UserRole } from 'meta/user/userRole'
+import { User } from 'meta/user/user'
+import { UserInvitation } from 'meta/user/userInvitation'
 
-export type UserInvitationSummary = UserRole<RoleName> & { email: string }
+export type UserInvitationSummary = UserInvitation & {
+  email: string
+  name: User['props']['name']
+  lang: User['props']['lang']
+}
diff --git a/src/meta/user/userInvitations.ts b/src/meta/user/userInvitations.ts
new file mode 100644
index 0000000000..0e581ada7b
--- /dev/null
+++ b/src/meta/user/userInvitations.ts
@@ -0,0 +1,8 @@
+import { UserInvitation } from 'meta/user/userInvitation'
+
+export const isExpired = (invitation: UserInvitation, expiryPeriod?: number) =>
+  new Date().getTime() - Date.parse(invitation.invitedAt) > (expiryPeriod || 7) * 86400000
+
+export const UserInvitations = {
+  isExpired,
+}
diff --git a/src/meta/user/userRole.ts b/src/meta/user/userRole.ts
index 11ad1b5e8d..7a238cda65 100644
--- a/src/meta/user/userRole.ts
+++ b/src/meta/user/userRole.ts
@@ -53,18 +53,17 @@ export type UserRoleExtendedProps = UserRoleBaseProps & {
 }
 
 export interface UserRole<Name extends RoleName, Props extends UserRoleBaseProps = undefined, Permissions = undefined> {
-  id: number
-  assessmentId?: number
-  cycleUuid: string
+  assessmentUuid?: string
   countryIso?: CountryIso
-  invitedByUserUuid?: string
+  createdAt: string
+  cycleUuid?: string
+  id: number
+  invitationUuid?: string
   permissions: Permissions
   props: Props
   role: Name
-  userId: number
-  invitationUuid: string
-  invitedAt: string
-  acceptedAt?: string
+  userUuid: string
+  uuid: string
 }
 
 export type UserRoleExtended<Name extends RoleName> = UserRole<Name, UserRoleExtendedProps>
diff --git a/src/meta/user/userRoles.test.ts b/src/meta/user/userRoles.test.ts
new file mode 100644
index 0000000000..421f1ef24f
--- /dev/null
+++ b/src/meta/user/userRoles.test.ts
@@ -0,0 +1,74 @@
+import { Assessment } from 'meta/assessment'
+import { User } from 'meta/user/user'
+
+import { RoleName, UserRole } from './userRole'
+import { UserRoles } from './userRoles'
+
+describe('UserRoles - getLastRole', () => {
+  const mockUser: User = {
+    id: 1,
+    name: 'Test User',
+    roles: [
+      {
+        id: 1,
+        role: RoleName.COLLABORATOR,
+        createdAt: '2024-01-01T00:00:00Z',
+        assessmentUuid: '1',
+      } as UserRole<RoleName.COLLABORATOR>,
+      {
+        id: 2,
+        role: RoleName.REVIEWER,
+        createdAt: '2024-02-01T00:00:00Z',
+        assessmentUuid: '1',
+      } as UserRole<RoleName.REVIEWER>,
+      {
+        id: 3,
+        role: RoleName.VIEWER,
+        createdAt: '2024-03-01T00:00:00Z',
+        assessmentUuid: '2',
+      } as UserRole<RoleName.VIEWER>,
+    ],
+  } as unknown as User
+
+  const mockAssessment: Assessment = {
+    uuid: '1',
+  } as Assessment
+
+  it('returns undefined when user is undefined', () => {
+    const result = UserRoles.getLastRole({ user: undefined as unknown as User })
+    expect(result).toBeUndefined()
+  })
+
+  it('returns undefined when user has no roles', () => {
+    const result = UserRoles.getLastRole({ user: { ...mockUser, roles: undefined } })
+    expect(result).toBeUndefined()
+  })
+
+  it('returns single role when user has only one role', () => {
+    const userWithOneRole = { ...mockUser, roles: [mockUser.roles[0]] }
+    const result = UserRoles.getLastRole({ user: userWithOneRole })
+    expect(result).toEqual(mockUser.roles[0])
+  })
+
+  it('returns most recent role when no assessment is specified', () => {
+    const result = UserRoles.getLastRole({ user: mockUser })
+    expect(result).toEqual(mockUser.roles[2])
+  })
+
+  it('returns most recent role for specific assessment', () => {
+    const result = UserRoles.getLastRole({ user: mockUser, assessment: mockAssessment })
+    expect(result).toEqual(mockUser.roles[1])
+  })
+
+  it('handles roles without createdAt dates', () => {
+    const userWithMixedDates = {
+      ...mockUser,
+      roles: [
+        { ...mockUser.roles[0], createdAt: undefined },
+        { ...mockUser.roles[1], createdAt: '2024-02-01T00:00:00Z' },
+      ],
+    }
+    const result = UserRoles.getLastRole({ user: userWithMixedDates })
+    expect(result).toEqual(userWithMixedDates.roles[1])
+  })
+})
diff --git a/src/meta/user/userRoles.ts b/src/meta/user/userRoles.ts
index 2d6e57fdf5..1911fe12e1 100644
--- a/src/meta/user/userRoles.ts
+++ b/src/meta/user/userRoles.ts
@@ -1,5 +1,5 @@
 import i18n from 'i18next'
-import { Objects } from 'utils/objects'
+import { Dates } from 'utils/dates'
 
 import { Areas, AssessmentStatus } from 'meta/area'
 import { Assessment } from 'meta/assessment'
@@ -7,12 +7,6 @@ import { User } from 'meta/user/user'
 
 import { RoleName, UserRole } from './userRole'
 
-export const isInvitationExpired = (userRole: UserRole<RoleName>, expiryPeriod?: number) =>
-  new Date().getTime() - Date.parse(userRole.invitedAt) > (expiryPeriod || 7) * 86400000
-
-export const isInvitationPending = (userRole: UserRole<RoleName>) =>
-  !Objects.isEmpty(userRole.invitedAt) && Objects.isEmpty(userRole.acceptedAt)
-
 const noRole = { role: 'NONE', labelKey: 'user.roles.noRole' }
 
 // Return roles to receive email on country assessment status change
@@ -43,17 +37,18 @@ const getLastRole = (params: { assessment?: Assessment; user: User }) => {
 
   if (!user || !user.roles) return undefined
 
-  const roles = assessment
-    ? user.roles.filter((role) => Number(role.assessmentId) === Number(assessment?.id))
-    : user.roles
+  const roles = assessment ? user.roles.filter((role) => role.assessmentUuid === assessment?.uuid) : user.roles
 
   if (roles.length === 1) return roles[0]
 
   const _roles = [...roles].sort((roleA, roleB) => {
-    if (!roleA.acceptedAt && !roleB.acceptedAt) return 0
-    if (!roleA.acceptedAt) return 1
-    if (!roleB.acceptedAt) return -1
-    return roleB.acceptedAt.localeCompare(roleA.acceptedAt)
+    if (!roleA.createdAt && !roleB.createdAt) return 0
+    if (!roleA.createdAt) return 1
+    if (!roleB.createdAt) return -1
+
+    const dateA = Dates.parseISO(roleA.createdAt)
+    const dateB = Dates.parseISO(roleB.createdAt)
+    return Dates.isBefore(dateB, dateA) ? -1 : 1
   })
 
   return _roles[0]
@@ -75,8 +70,6 @@ const sortRolesByRolesAndCountry = (
   (i18n.t(Areas.getTranslationKey(countryIsoA)) < i18n.t(Areas.getTranslationKey(countryIsoB)) ? -1 : 1)
 
 export const UserRoles = {
-  isInvitationExpired,
-  isInvitationPending,
   noRole,
   getRecipientRoles,
   getLastRole,
diff --git a/src/meta/user/users.ts b/src/meta/user/users.ts
index c604d76c48..e6b5309dbb 100644
--- a/src/meta/user/users.ts
+++ b/src/meta/user/users.ts
@@ -63,7 +63,7 @@ const hasEditorRole = (props: { user: User; countryIso: AreaCode; cycle: Cycle }
 const hasRoleInAssessment = (props: { user: User; assessment: Assessment }): boolean => {
   const { assessment, user } = props
   if (isAdministrator(user)) return true
-  return user?.roles?.some((role) => Number(role.assessmentId) === Number(assessment.id))
+  return user?.roles?.some((role) => role.assessmentUuid === assessment.uuid)
 }
 
 const hasRoleInCycle = (props: { user: User; cycle: Cycle }): boolean => {
diff --git a/src/server/api/admin/_getUsersGetManyPropsFromRequest.ts b/src/server/api/admin/_getUsersGetManyPropsFromRequest.ts
new file mode 100644
index 0000000000..7618a1c505
--- /dev/null
+++ b/src/server/api/admin/_getUsersGetManyPropsFromRequest.ts
@@ -0,0 +1,25 @@
+import { UsersRequest } from 'meta/api/request'
+import { TablePaginateds, UserFilters } from 'meta/tablePaginated'
+
+import { AssessmentController } from 'server/controller/assessment'
+import { UsersGetManyProps } from 'server/repository/public/user'
+
+export const getUsersGetManyPropsFromRequest = async (req: UsersRequest): Promise<UsersGetManyProps> => {
+  const {
+    assessmentName,
+    cycleName,
+    filters: filtersReq,
+    limit: limitReq,
+    offset: offsetReq,
+    orderBy,
+    orderByDirection,
+  } = req.query
+
+  const { assessment, cycle } = await AssessmentController.getOneWithCycle({ assessmentName, cycleName })
+
+  const filters = TablePaginateds.decodeFilters<UserFilters>(filtersReq)
+  const limit = limitReq && Number(limitReq)
+  const offset = offsetReq && Number(offsetReq)
+
+  return { assessment, cycle, filters, limit, offset, orderBy, orderByDirection }
+}
diff --git a/src/server/api/admin/exportUsers.ts b/src/server/api/admin/exportUsers.ts
index f5733948ac..7f6f84851a 100644
--- a/src/server/api/admin/exportUsers.ts
+++ b/src/server/api/admin/exportUsers.ts
@@ -1,43 +1,24 @@
 import { Response } from 'express'
 
 import { UsersRequest } from 'meta/api/request'
-import { TablePaginateds, UserFilters } from 'meta/tablePaginated'
-import { User, UserStatus } from 'meta/user'
+import { User } from 'meta/user'
 
-import { AssessmentController } from 'server/controller/assessment'
+import { getUsersGetManyPropsFromRequest } from 'server/api/admin/_getUsersGetManyPropsFromRequest'
 import { UserController } from 'server/controller/user'
 import { ExportService } from 'server/service/export'
 import Requests from 'server/utils/requests'
 
 export const exportUsers = async (req: UsersRequest, res: Response) => {
   try {
-    const { assessmentName, cycleName, limit, offset, orderBy, orderByDirection, filters } = req.query
-
-    const decodedFilters = TablePaginateds.decodeFilters(filters) as UserFilters
-    const { administrators, countries, fullName, roles } = decodedFilters ?? {}
-
-    const { assessment, cycle } = await AssessmentController.getOneWithCycle({ assessmentName, cycleName })
+    const props = await getUsersGetManyPropsFromRequest(req)
 
+    const { assessment, cycle } = props
     const fileName = `users-${assessment.props.name}-${cycle.name}.csv`
     const user = Requests.getUser(req)
     const { lang } = user.props
 
-    const { query, queryParams, rowTransformer } = await UserController.getManyExport({
-      administrators,
-      assessment,
-      countries: countries || [],
-      cycle,
-      fullName: fullName || '',
-      lang,
-      limit: limit && Number(limit),
-      offset: offset && Number(offset),
-      orderBy,
-      orderByDirection,
-      roles: roles || [],
-      statuses: [UserStatus.active, UserStatus.disabled, UserStatus.invitationPending],
-    })
+    const { query, queryParams, rowTransformer } = await UserController.getManyExport({ ...props, lang })
 
-    // @ts-ignore
     await ExportService.queryToCsvResponseStream<User>({ fileName, query, queryParams, res, rowTransformer })
   } catch (e) {
     Requests.sendErr(res, e)
diff --git a/src/server/api/admin/getUsers.ts b/src/server/api/admin/getUsers.ts
index 704f136cd9..d95f0f90fc 100644
--- a/src/server/api/admin/getUsers.ts
+++ b/src/server/api/admin/getUsers.ts
@@ -1,35 +1,16 @@
 import { Response } from 'express'
 
 import { UsersRequest } from 'meta/api/request'
-import { TablePaginateds, UserFilters } from 'meta/tablePaginated'
-import { UserStatus } from 'meta/user'
 
-import { AssessmentController } from 'server/controller/assessment'
+import { getUsersGetManyPropsFromRequest } from 'server/api/admin/_getUsersGetManyPropsFromRequest'
 import { UserController } from 'server/controller/user'
 import Requests from 'server/utils/requests'
 
 export const getUsers = async (req: UsersRequest, res: Response) => {
   try {
-    const { assessmentName, cycleName, limit, offset, orderBy, orderByDirection, filters } = req.query
+    const props = await getUsersGetManyPropsFromRequest(req)
 
-    const decodedFilters = TablePaginateds.decodeFilters(filters) as UserFilters
-    const { administrators, countries, fullName, roles } = decodedFilters ?? {}
-
-    const { assessment, cycle } = await AssessmentController.getOneWithCycle({ assessmentName, cycleName })
-
-    const users = await UserController.getMany({
-      administrators,
-      assessment,
-      countries: countries || [],
-      cycle,
-      fullName: fullName || '',
-      limit: limit && Number(limit),
-      offset: offset && Number(offset),
-      orderBy,
-      orderByDirection,
-      roles: roles || [],
-      statuses: [UserStatus.active, UserStatus.disabled, UserStatus.invitationPending],
-    })
+    const users = await UserController.getMany(props)
 
     Requests.sendOk(res, users)
   } catch (e) {
diff --git a/src/server/api/admin/getUsersCount.ts b/src/server/api/admin/getUsersCount.ts
index e7834734ba..ed865eb87f 100644
--- a/src/server/api/admin/getUsersCount.ts
+++ b/src/server/api/admin/getUsersCount.ts
@@ -9,21 +9,12 @@ import Requests from 'server/utils/requests'
 
 export const getUsersCount = async (req: UsersRequest, res: Response) => {
   try {
-    const { assessmentName, cycleName, filters } = req.query
-
-    const decodedFilters = TablePaginateds.decodeFilters(filters) as UserFilters
-    const { administrators, countries, fullName, roles } = decodedFilters ?? {}
+    const { assessmentName, cycleName, filters: filtersReq } = req.query
 
     const { assessment, cycle } = await AssessmentController.getOneWithCycle({ assessmentName, cycleName })
 
-    const count = await UserController.count({
-      administrators,
-      assessment,
-      countries: countries || [],
-      cycle,
-      fullName: fullName || '',
-      roles: roles || [],
-    })
+    const filters = TablePaginateds.decodeFilters<UserFilters>(filtersReq)
+    const count = await UserController.count({ assessment, cycle, filters })
 
     Requests.sendOk(res, count)
   } catch (e) {
diff --git a/src/server/api/auth/strategy/google.ts b/src/server/api/auth/strategy/google.ts
index f45c51b7f2..ed671c92b7 100644
--- a/src/server/api/auth/strategy/google.ts
+++ b/src/server/api/auth/strategy/google.ts
@@ -28,7 +28,7 @@ const googleStrategyVerifyCallback = async (
     const { invitationUuid } = state
 
     if (invitationUuid) {
-      const { user: invitedUser, userRole } = await UserController.findByInvitation({ invitationUuid })
+      const { user: invitedUser, userInvitation } = await UserController.findByInvitation({ invitationUuid })
 
       const userProviders = await UserProviderController.read<AuthProviderGoogleProps>({
         user: invitedUser,
@@ -56,15 +56,15 @@ const googleStrategyVerifyCallback = async (
 
         if (googleMatch) {
           const { assessment, cycle } = await AssessmentController.getOneWithCycle({
-            id: userRole.assessmentId,
-            cycleUuid: userRole.cycleUuid,
+            uuid: userInvitation.assessmentUuid,
+            cycleUuid: userInvitation.cycleUuid,
           })
 
-          user = await UserController.acceptInvitation({ assessment, cycle, user: invitedUser, userRole })
+          user = await UserController.acceptInvitation({ assessment, cycle, user: invitedUser, userInvitation })
 
           done(null, user, {
             message: JSON.stringify({
-              countryIso: userRole.countryIso,
+              countryIso: userInvitation.countryIso,
               assessmentName: assessment.props.name,
               cycleName: cycle.name,
             }),
diff --git a/src/server/api/auth/strategy/local.ts b/src/server/api/auth/strategy/local.ts
index 581be645a6..7ee78c9a70 100644
--- a/src/server/api/auth/strategy/local.ts
+++ b/src/server/api/auth/strategy/local.ts
@@ -1,8 +1,8 @@
-import { Objects } from 'utils/objects'
 import { Request } from 'express'
 import { PassportStatic } from 'passport'
 import { VerifiedCallback } from 'passport-jwt'
 import * as passportLocal from 'passport-local'
+import { Objects } from 'utils/objects'
 
 import { AuthProvider, Users } from 'meta/user'
 import { AuthProviderLocalProps } from 'meta/user/userAuth'
@@ -24,7 +24,7 @@ const localStrategyVerifyCallback = async (req: Request, email: string, password
       const invitationUuid = req.query?.invitationUuid as string
 
       if (invitationUuid) {
-        const { user: invitedUser, userRole } = await UserController.findByInvitation({ invitationUuid })
+        const { user: invitedUser, userInvitation } = await UserController.findByInvitation({ invitationUuid })
 
         const userProviders = await UserProviderController.read<AuthProviderLocalProps>({
           user: invitedUser,
@@ -44,14 +44,14 @@ const localStrategyVerifyCallback = async (req: Request, email: string, password
 
         if (passwordMatch) {
           const { assessment, cycle } = await AssessmentController.getOneWithCycle({
-            id: userRole.assessmentId,
-            cycleUuid: userRole.cycleUuid,
+            uuid: userInvitation.assessmentUuid,
+            cycleUuid: userInvitation.cycleUuid,
           })
 
-          const user = await UserController.acceptInvitation({ assessment, cycle, user: invitedUser, userRole })
+          const user = await UserController.acceptInvitation({ assessment, cycle, user: invitedUser, userInvitation })
 
           done(null, user, {
-            countryIso: userRole.countryIso,
+            countryIso: userInvitation.countryIso,
             assessmentName: assessment.props.name,
             cycleName: cycle.name,
           })
diff --git a/src/server/api/user/acceptInvitation.ts b/src/server/api/user/acceptInvitation.ts
index 4ff47625d5..5d0ae8164e 100644
--- a/src/server/api/user/acceptInvitation.ts
+++ b/src/server/api/user/acceptInvitation.ts
@@ -10,14 +10,13 @@ export const acceptInvitation = async (req: CycleRequest<{ invitationUuid: strin
   try {
     const { invitationUuid } = req.query
 
-    const { user, userRole } = await UserController.findByInvitation({ invitationUuid })
+    const { user, userInvitation } = await UserController.findByInvitation({ invitationUuid })
 
-    const { assessment, cycle } = await AssessmentController.getOneWithCycle({
-      id: userRole.assessmentId,
-      cycleUuid: userRole.cycleUuid,
-    })
+    const uuid = userInvitation.assessmentUuid
+    const { cycleUuid } = userInvitation
+    const { assessment, cycle } = await AssessmentController.getOneWithCycle({ uuid, cycleUuid })
 
-    const acceptedUser = await UserController.acceptInvitation({ assessment, cycle, user, userRole })
+    const acceptedUser = await UserController.acceptInvitation({ assessment, cycle, user, userInvitation })
 
     Requests.sendOk(res, {
       user: acceptedUser,
diff --git a/src/server/api/user/getInvitation.ts b/src/server/api/user/getInvitation.ts
index d14e0df8e9..469f78ac5d 100644
--- a/src/server/api/user/getInvitation.ts
+++ b/src/server/api/user/getInvitation.ts
@@ -9,14 +9,9 @@ export const getInvitation = async (req: CycleRequest<{ invitationUuid: string }
   try {
     const { invitationUuid } = req.query
 
-    const { userRole, assessment, user, userProviders } = await UserController.findByInvitation({ invitationUuid })
+    const invitation = await UserController.findByInvitation({ invitationUuid })
 
-    Requests.sendOk(res, {
-      userRole,
-      assessment,
-      user,
-      userProviders,
-    })
+    Requests.sendOk(res, invitation)
   } catch (e) {
     Requests.sendErr(res, e)
   }
diff --git a/src/server/api/user/getMany.ts b/src/server/api/user/getMany.ts
index 808f35c9f6..f8e0067e4f 100644
--- a/src/server/api/user/getMany.ts
+++ b/src/server/api/user/getMany.ts
@@ -13,11 +13,7 @@ export const getMany = async (req: CycleRequest<{ print: string }>, res: Respons
 
     const { assessment, cycle } = await AssessmentController.getOneWithCycle({ assessmentName, cycleName })
 
-    let users = await UserController.getMany({
-      assessment,
-      countryIso,
-      cycle,
-    })
+    let users = await UserController.getMany({ assessment, cycle, countryIso })
 
     if (print && print === 'true')
       users = users.filter((user) => !ProcessEnv.fraReportCollaboratorsExcluded.includes(user.email))
diff --git a/src/server/api/user/index.ts b/src/server/api/user/index.ts
index 622d1d2ea1..fa03db61fa 100644
--- a/src/server/api/user/index.ts
+++ b/src/server/api/user/index.ts
@@ -22,15 +22,15 @@ import { updateUserRoles } from './updateUserRoles'
 
 export const UserApi = {
   init: (express: Express): void => {
-    express.put(ApiEndPoint.User.many(), multer().single('profilePicture'), AuthMiddleware.requireEditUser, updateUser)
+    express.put(ApiEndPoint.User.one(), multer().single('profilePicture'), AuthMiddleware.requireEditUser, updateUser)
     express.get(ApiEndPoint.User.many(), AuthMiddleware.requireViewUsers, getMany)
     express.get(ApiEndPoint.User.one(), AuthMiddleware.requireViewUser, getUser)
 
-    express.post(ApiEndPoint.User.invite(), AuthMiddleware.requireInviteUser, invite)
-    express.get(ApiEndPoint.User.invitation(), getInvitation)
     express.delete(ApiEndPoint.User.invitation(), AuthMiddleware.requireInviteUser, removeInvitation)
+    express.get(ApiEndPoint.User.invitation(), getInvitation)
     express.get(ApiEndPoint.User.invitationAccept(), acceptInvitation)
     express.get(ApiEndPoint.User.invitationSendEmail(), AuthMiddleware.requireInviteUser, sendInvitationEmail)
+    express.post(ApiEndPoint.User.invite(), AuthMiddleware.requireInviteUser, invite)
 
     express.get(ApiEndPoint.User.resetPassword(), getResetPassword)
 
diff --git a/src/server/api/user/removeInvitation.ts b/src/server/api/user/removeInvitation.ts
index cb3fed9778..ed8824f801 100644
--- a/src/server/api/user/removeInvitation.ts
+++ b/src/server/api/user/removeInvitation.ts
@@ -10,22 +10,20 @@ export const removeInvitation = async (req: CycleRequest<{ invitationUuid: strin
   try {
     const { countryIso, invitationUuid } = req.query
 
-    const { assessment, userRole } = await UserController.findByInvitation({ invitationUuid })
+    const { assessment, userInvitation } = await UserController.findByInvitation({ invitationUuid })
 
-    const { cycle } = await AssessmentController.getOneWithCycle({
-      assessmentName: assessment.props.name,
-      cycleUuid: userRole.cycleUuid,
-    })
+    const assessmentName = assessment.props.name
+    const { cycleUuid } = userInvitation
+    const { cycle } = await AssessmentController.getOneWithCycle({ assessmentName, cycleUuid })
 
-    const removedUserRole = await UserController.removeInvitation({
-      countryIso,
-      assessment,
-      cycle,
-      invitationUuid,
-      user: Requests.getUser(req),
-    })
+    const user = Requests.getUser(req)
+    const removeInvitationProps = { assessment, cycle, countryIso, invitationUuid, user }
+    const removedUserInvitation = await UserController.removeInvitation(removeInvitationProps)
 
-    Requests.sendOk(res, removedUserRole)
+    // TODO: This has changed
+    // { userRole => userInvitation }
+    // Update frontend accordingly
+    Requests.sendOk(res, removedUserInvitation)
   } catch (e) {
     Requests.sendErr(res, e)
   }
diff --git a/src/server/api/user/updateRoleProps.ts b/src/server/api/user/updateRoleProps.ts
index c2e6d871a8..8390cc9a0f 100644
--- a/src/server/api/user/updateRoleProps.ts
+++ b/src/server/api/user/updateRoleProps.ts
@@ -7,10 +7,7 @@ export const updateRoleProps = async (req: Request, res: Response) => {
   try {
     const { id, props } = req.body.role
 
-    const userRole = await UserController.updateRoleProps({
-      id,
-      props,
-    })
+    const userRole = await UserController.updateRoleProps({ id, props })
 
     Requests.sendOk(res, userRole)
   } catch (e) {
diff --git a/src/server/api/user/updateUserAdminRole.ts b/src/server/api/user/updateUserAdminRole.ts
index 2df0db8e1c..a521de2238 100644
--- a/src/server/api/user/updateUserAdminRole.ts
+++ b/src/server/api/user/updateUserAdminRole.ts
@@ -5,17 +5,17 @@ import { RoleName, Users } from 'meta/user'
 import { UserController } from 'server/controller/user'
 import { Requests } from 'server/utils'
 
-export const updateUserAdminRole = async (req: Request<{ userId: string }>, res: Response) => {
+export const updateUserAdminRole = async (req: Request<{ userUuid: string }>, res: Response) => {
   try {
-    const { userId } = req.body
+    const { userUuid } = req.body
 
     const user = Requests.getUser(req)
 
-    const userToUpdate = await UserController.getOne({ id: userId })
+    const userToUpdate = await UserController.getOne({ uuid: userUuid })
 
     const updatedUser = await UserController.updateUserRoles({
       roles: !Users.isAdministrator(userToUpdate) ? [{ role: RoleName.ADMINISTRATOR }] : [],
-      userId: Number(userId),
+      userUuid,
       user,
     })
 
diff --git a/src/server/api/user/updateUserRoles.ts b/src/server/api/user/updateUserRoles.ts
index 6594db6b89..fd1e3f83d9 100644
--- a/src/server/api/user/updateUserRoles.ts
+++ b/src/server/api/user/updateUserRoles.ts
@@ -11,7 +11,7 @@ export const updateUserRoles = async (
   res: Response
 ) => {
   try {
-    const { assessmentName, cycleName, roles, userId } = req.body
+    const { assessmentName, cycleName, roles, userUuid } = req.body
 
     const user = Requests.getUser(req)
 
@@ -20,7 +20,7 @@ export const updateUserRoles = async (
     const updatedUser = await UserController.updateUserRoles({
       cycleUuid: cycle.uuid,
       roles,
-      userId,
+      userUuid,
       user,
     })
 
diff --git a/src/server/controller/assessment/cloneCycle/_cloneUserRoles.ts b/src/server/controller/assessment/cloneCycle/_cloneUserRoles.ts
index a6bbd3be32..399816d39d 100644
--- a/src/server/controller/assessment/cloneCycle/_cloneUserRoles.ts
+++ b/src/server/controller/assessment/cloneCycle/_cloneUserRoles.ts
@@ -6,26 +6,29 @@ export const cloneUserRoles = async (props: CloneProps, client: BaseProtocol): P
 
   await client.query(
     `
-      insert into users_role (user_id, assessment_id, country_iso, role, props, cycle_uuid, invitation_uuid, invited_at,
-                              accepted_at, permissions, invited_by_user_uuid)
-      select ur.user_id,
-             ur.assessment_id,
-             ur.country_iso,
-             ur.role,
-             ur.props,
-             '${cycleTarget.uuid}' as cycle_uuid,
-             ur.invitation_uuid,
-             ur.invited_at,
-             ur.accepted_at,
-             ur.permissions,
-             ur.invited_by_user_uuid
+      insert into public.users_role (
+        assessment_uuid,
+        cycle_uuid,
+        country_iso,
+        user_uuid,
+        role,
+        props,
+        permissions,
+        created_at
+      )
+      select 
+        ur.assessment_uuid,
+        $3 as cycle_uuid,
+        ur.country_iso,
+        ur.user_uuid,
+        ur.role,
+        ur.props,
+        ur.permissions,
+        $4 as created_at
       from users_role ur
-               left join assessment a on ur.assessment_id = a.id
-               left join public.assessment_cycle ac on ur.cycle_uuid = ac.uuid and a.id = ac.assessment_id
-      where a.id = $1
-        and ac.id = $2
-
-  `,
-    [assessment.id, cycleSource.id]
+      where ur.assessment_uuid = $1
+        and ur.cycle_uuid = $2
+    `,
+    [assessment.uuid, cycleSource.uuid, cycleTarget.uuid, cycleTarget.props.dateCreated]
   )
 }
diff --git a/src/server/controller/assessment/cloneCycle/_generateMaterializedViews.ts b/src/server/controller/assessment/cloneCycle/_generateMaterializedViews.ts
index ac74f24459..56714b2e4f 100644
--- a/src/server/controller/assessment/cloneCycle/_generateMaterializedViews.ts
+++ b/src/server/controller/assessment/cloneCycle/_generateMaterializedViews.ts
@@ -10,13 +10,13 @@ export const generateMaterializedViews = async (props: CloneProps, client: BaseP
 
   await Promise.all([
     TableData.refreshViews({ assessment, cycle: cycleTarget }, client),
-    CountrySummaryRepository.createMaterializedView({ assessment, cycle: cycleTarget }),
+    CountrySummaryRepository.createMaterializedView({ assessment, cycle: cycleTarget }, client),
   ])
 
   const countries = await CountryRepository.getMany({ assessment, cycle: cycleTarget }, client)
   await Promise.all([
     ...countries.map(({ countryIso }) =>
-      CountryActivityLogRepository.createMaterializedView({ assessment, cycle: cycleTarget, countryIso })
+      CountryActivityLogRepository.createMaterializedView({ assessment, cycle: cycleTarget, countryIso }, client)
     ),
   ])
 }
diff --git a/src/server/controller/assessment/getOne.ts b/src/server/controller/assessment/getOne.ts
index a33ce9cc32..1c9890453e 100644
--- a/src/server/controller/assessment/getOne.ts
+++ b/src/server/controller/assessment/getOne.ts
@@ -3,7 +3,10 @@ import { Assessment, Cycle } from 'meta/assessment'
 import { BaseProtocol, DB } from 'server/db'
 import { AssessmentRepository } from 'server/repository/assessment/assessment'
 
-type Props = { assessmentName: string; metaCache?: boolean } | { id: number; metaCache?: boolean }
+type Props =
+  | { assessmentName: string; metaCache?: boolean }
+  | { id: number; metaCache?: boolean }
+  | { uuid: string; metaCache?: boolean }
 
 const _getCycleByName = (props: { cycleName?: string; assessment: Assessment }): Cycle | undefined => {
   const { cycleName, assessment } = props
diff --git a/src/server/controller/user/acceptInvitation.ts b/src/server/controller/user/acceptInvitation.ts
index 1d403d4b7c..36093f4242 100644
--- a/src/server/controller/user/acceptInvitation.ts
+++ b/src/server/controller/user/acceptInvitation.ts
@@ -1,61 +1,61 @@
 import { Objects } from 'utils/objects'
 
 import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment'
-import { RoleName, User, UserRole, UserStatus } from 'meta/user'
-import { UserRoles } from 'meta/user/userRoles'
+import { User, UserInvitation, UserInvitations, UserStatus } from 'meta/user'
 
 import { BaseProtocol, DB } from 'server/db'
 import { ActivityLogRepository } from 'server/repository/public/activityLog'
 import { UserRepository } from 'server/repository/public/user'
+import { UserInvitationRepository } from 'server/repository/public/userInvitation'
 import { UserRoleRepository } from 'server/repository/public/userRole'
 import { MailService } from 'server/service'
 
-export const acceptInvitation = async (
-  props: {
-    assessment: Assessment
-    cycle: Cycle
-    user: User
-    userRole: UserRole<RoleName>
-  },
-  client: BaseProtocol = DB
-): Promise<User> => {
-  const { assessment, cycle, user, userRole } = props
+// Accept invitation flow:
+// 1. UserInvitationRepository.accept: update field acceptedAt
+// 2. UserRoleRepository.create: create user role
+// 3. ActivityLogRepository.insertActivityLog: log activity
+// 4. MailService.userNotifyAcceptedInvitation
+// 5. UserRepository.update
+
+type Props = {
+  assessment: Assessment
+  cycle: Cycle
+  user: User
+  userInvitation: UserInvitation
+}
+
+export const acceptInvitation = async (props: Props, client: BaseProtocol = DB): Promise<User> => {
+  const { assessment, cycle, user, userInvitation: userInvitationProp } = props
 
   return client.tx(async (t) => {
-    if (UserRoles.isInvitationExpired(userRole)) throw new Error('login.invitationExpired')
-    if (userRole.acceptedAt !== null) throw new Error('login.alreadyAcceptedInvitation')
+    if (UserInvitations.isExpired(userInvitationProp)) throw new Error('login.invitationExpired')
+    if (userInvitationProp.acceptedAt !== null) throw new Error('login.alreadyAcceptedInvitation')
+
+    const userInvitation = await UserInvitationRepository.accept({ userInvitation: userInvitationProp }, t)
+    const assessmentUuid = assessment.uuid
+    const cycleUuid = cycle.uuid
+    const { countryIso } = userInvitation
+    const userUuid = user.uuid
+    const { role } = userInvitation
+    const invitationUuid = userInvitation.uuid
+    const userRoleCreateProps = { assessmentUuid, cycleUuid, countryIso, userUuid, role, invitationUuid }
 
-    await UserRoleRepository.acceptInvitation({ userRole }, t)
+    const userRole = await UserRoleRepository.create(userRoleCreateProps, t)
 
     user.status = UserStatus.active
 
-    const { countryIso, userId, role } = userRole
-
-    await ActivityLogRepository.insertActivityLog(
-      {
-        activityLog: {
-          target: { userId, user: user.props.name, role },
-          section: 'users',
-          message: ActivityLogMessage.invitationAccept,
-          countryIso,
-          user,
-        },
-        assessment,
-        cycle,
-      },
-      t
-    )
-
-    if (!Objects.isEmpty(userRole.invitedByUserUuid)) {
-      const invitingUser = await UserRepository.getOne({ uuid: userRole.invitedByUserUuid })
-      await MailService.userNotifyAcceptedInvitation({
-        assessmentName: assessment.props.name,
-        countryIso,
-        cycleName: cycle.name,
-        invitedUser: user,
-        invitedUserRole: userRole,
-        recipient: invitingUser,
-      })
+    const target = { userUuid, user: user.props.name, role }
+    const activityLog = { target, section: 'users', message: ActivityLogMessage.invitationAccept, countryIso, user }
+    await ActivityLogRepository.insertActivityLog({ activityLog, assessment, cycle }, t)
+
+    if (!Objects.isEmpty(userInvitation.invitedByUserUuid)) {
+      const recipient = await UserRepository.getOne({ uuid: userInvitation.invitedByUserUuid })
+      const assessmentName = assessment.props.name
+      const cycleName = cycle.name
+      const invitedUser = user
+      const invitedUserRole = userRole
+      const mailServiceProps = { assessmentName, countryIso, cycleName, invitedUser, invitedUserRole, recipient }
+      await MailService.userNotifyAcceptedInvitation(mailServiceProps)
     }
 
     return UserRepository.update({ user }, t)
diff --git a/src/server/controller/user/findByInvitation.ts b/src/server/controller/user/findByInvitation.ts
index d15765a023..64bacc9bd9 100644
--- a/src/server/controller/user/findByInvitation.ts
+++ b/src/server/controller/user/findByInvitation.ts
@@ -1,5 +1,5 @@
 import { Assessment } from 'meta/assessment'
-import { AuthProvider, RoleName, User, UserRole } from 'meta/user'
+import { AuthProvider, User, UserInvitation } from 'meta/user'
 
 import { BaseProtocol, DB } from 'server/db'
 import { AssessmentRepository } from 'server/repository/assessment/assessment'
@@ -7,28 +7,29 @@ import { UserRepository } from 'server/repository/public/user'
 import { UserInvitationRepository } from 'server/repository/public/userInvitation'
 import { UserProviderRepository } from 'server/repository/public/userProvider'
 
-export const findByInvitation = async (
-  props: { invitationUuid: string },
-  client: BaseProtocol = DB
-): Promise<{
+type Props = {
+  invitationUuid: string
+}
+
+type Returned = {
   assessment: Assessment
   user: User
   userProviders: Array<AuthProvider>
-  userRole: UserRole<RoleName>
-}> => {
-  const { invitationUuid } = props
-
-  const userRole = await UserInvitationRepository.getOne({ invitationUuid }, client)
+  userInvitation: UserInvitation
+}
 
-  const user = await UserRepository.getOne({ id: userRole.userId }, client)
+export const findByInvitation = async (props: Props, client: BaseProtocol = DB): Promise<Returned> => {
+  const { invitationUuid } = props
 
+  const userInvitation = await UserInvitationRepository.getOne({ invitationUuid }, client)
+  const user = await UserRepository.getOne({ uuid: userInvitation.userUuid }, client)
   const userProviders = await UserProviderRepository.getUserProviders({ user }, client)
+  const assessment = await AssessmentRepository.getOne({ uuid: userInvitation.assessmentUuid }, client)
 
-  const assessment = await AssessmentRepository.getOne({ id: userRole.assessmentId }, client)
   return {
     assessment,
     user,
     userProviders,
-    userRole,
+    userInvitation,
   }
 }
diff --git a/src/server/controller/user/getManyExport.ts b/src/server/controller/user/getManyExport.ts
index 17cad8e4a4..95cfd3942e 100644
--- a/src/server/controller/user/getManyExport.ts
+++ b/src/server/controller/user/getManyExport.ts
@@ -3,10 +3,11 @@ import { Objects } from 'utils/objects'
 
 import { Areas } from 'meta/area'
 import { Lang } from 'meta/lang'
-import { RoleName, User, Users } from 'meta/user'
+import { CountryUserSummary, RoleName, User, Users } from 'meta/user'
 
 import { UserRoleAdapter } from 'server/repository/adapter'
 import { UserRepository, UsersGetManyProps } from 'server/repository/public/user'
+import { UserQueryParams } from 'server/repository/public/user/UserQueryParams'
 
 type Props = UsersGetManyProps & {
   lang: Lang
@@ -14,7 +15,7 @@ type Props = UsersGetManyProps & {
 
 type Returned = {
   query: string
-  queryParams: Array<string | number>
+  queryParams: UserQueryParams
   rowTransformer: (rawUser: User) => Record<string, string>
 }
 
@@ -38,9 +39,9 @@ export const getManyExport = async (props: Props): Promise<Returned> => {
     [RoleName.VIEWER]: i18n.t(Users.getI18nRoleLabelKey(RoleName.VIEWER)),
   }
 
-  const rowTransformer = (rawUser: User): Record<string, string> => {
+  const rowTransformer = (rawUser: CountryUserSummary): Record<string, string> => {
     const { roles, ...user } = rawUser
-    const userRow: User = {
+    const userRow: CountryUserSummary = {
       ...Objects.camelize(user),
       roles: roles.map(UserRoleAdapter),
     }
@@ -57,7 +58,7 @@ export const getManyExport = async (props: Props): Promise<Returned> => {
       return roleCountries
     }
 
-    const name = Users.getFullName(userRow)
+    const name = userRow.fullName
     const { email } = user
 
     const rowData: Record<string, string> = {
diff --git a/src/server/controller/user/invite.ts b/src/server/controller/user/invite.ts
index 3cc8e0c982..341d259d22 100644
--- a/src/server/controller/user/invite.ts
+++ b/src/server/controller/user/invite.ts
@@ -1,85 +1,68 @@
 import { CountryIso } from 'meta/area'
 import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment'
 import { Lang } from 'meta/lang'
-import { CollaboratorPermissions, RoleName, User, UserRole } from 'meta/user'
+import { RoleName, User, UserInvitation } from 'meta/user'
 
 import { BaseProtocol, DB } from 'server/db'
 import { ActivityLogRepository } from 'server/repository/public/activityLog'
 import { UserRepository } from 'server/repository/public/user'
-import { UserRoleRepository } from 'server/repository/public/userRole'
+import { UserInvitationRepository } from 'server/repository/public/userInvitation'
 import { MailService } from 'server/service'
 
-export const invite = async (
-  props: {
-    assessment: Assessment
-    countryIso: CountryIso
-    cycle: Cycle
-    email: string
-    lang: Lang
-    name?: string
-    permissions?: CollaboratorPermissions
-    roleName: RoleName
-    surname?: string
-    user: User
-  },
-  client: BaseProtocol = DB
-): Promise<{ userRole: UserRole<RoleName>; user: User }> => {
-  const { assessment, cycle, countryIso, email, lang, name, permissions, roleName, surname, user } = props
+type UserProps = {
+  email: string
+  name?: string
+  surname?: string
+  lang: Lang
+}
+
+type Props = {
+  assessment: Assessment
+  countryIso: CountryIso
+  cycle: Cycle
+  user: User
+  roleName: RoleName
+} & UserProps
+
+type Returned = { userInvitation: UserInvitation; user: User }
+
+const _getOrCreateUserToInvite = async (props: UserProps, client: BaseProtocol): Promise<User> => {
+  const { email, email: emailGoogle, name, surname, lang } = props
+
+  // Get user with primary email
+  let userToInvite: User = await UserRepository.getOne({ email }, client)
+  // If user with primary email not found, check if user has active google login
+  if (!userToInvite) userToInvite = await UserRepository.getOne({ emailGoogle }, client)
+  // If neither of above, create new user
+  if (!userToInvite) {
+    const user = { email, props: { name, surname, lang } }
+    userToInvite = await UserRepository.create({ user }, client)
+  }
+  return userToInvite
+}
+
+export const invite = async (props: Props, client: BaseProtocol = DB): Promise<Returned> => {
+  const { assessment, cycle, countryIso, email, lang, name, roleName, surname, user } = props
 
   return client.tx(async (t) => {
-    // Get user with primary email
-    let userToInvite = await UserRepository.getOne({ email }, t)
-    // If user with primary email not found, check if user has active google login
-    if (!userToInvite) userToInvite = await UserRepository.getOne({ emailGoogle: email }, t)
-    // If neither of above, create new user
-    if (!userToInvite)
-      userToInvite = await UserRepository.create(
-        { user: { email, props: { name: name ?? '', surname: surname ?? '', lang } } },
-        client
-      )
+    const userToInvite = await _getOrCreateUserToInvite({ email, name, surname, lang }, t)
 
-    const userRole = await UserRoleRepository.create(
-      {
-        assessment,
-        country: countryIso,
-        cycle,
-        invitedByUserUuid: user.uuid,
-        permissions,
-        props: { address: { countryIso }, primaryEmail: email },
-        role: roleName,
-        user: userToInvite,
-      },
-      t
-    )
+    const userInvitationProps = { assessment, countryIso, cycle, invitedBy: user, role: roleName, user: userToInvite }
+    const userInvitation: UserInvitation = await UserInvitationRepository.create(userInvitationProps, t)
 
-    const { userId, role } = userRole
+    const { userUuid, role } = userInvitation
 
-    await ActivityLogRepository.insertActivityLog(
-      {
-        activityLog: {
-          target: { userId, user: userToInvite.props.name, role },
-          section: 'users',
-          message: ActivityLogMessage.invitationAdd,
-          countryIso,
-          user,
-        },
-        assessment,
-        cycle,
-      },
-      t
-    )
+    const target = { userUuid, user: userToInvite.props.name, role }
+    const message = ActivityLogMessage.invitationAdd
+    const section = 'users'
+    const activityLog = { target, section, message, countryIso, user }
+    await ActivityLogRepository.insertActivityLog({ activityLog, assessment, cycle }, t)
 
-    await MailService.userInvite({
-      countryIso,
-      assessmentName: assessment.props.name,
-      cycleName: cycle.name,
-      role: userRole,
-      userToInvite,
-    })
+    const assessmentName = assessment.props.name
+    const cycleName = cycle.name
+    const mailProps = { countryIso, assessmentName, cycleName, userInvitation, userToInvite }
+    await MailService.userInvite(mailProps)
 
-    return {
-      userRole,
-      user: userToInvite,
-    }
+    return { userInvitation, user: userToInvite }
   })
 }
diff --git a/src/server/controller/user/removeInvitation.ts b/src/server/controller/user/removeInvitation.ts
index 26c405b564..d5f8011e98 100644
--- a/src/server/controller/user/removeInvitation.ts
+++ b/src/server/controller/user/removeInvitation.ts
@@ -1,46 +1,34 @@
 import { CountryIso } from 'meta/area'
 import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment'
-import { RoleName, User, UserRole } from 'meta/user'
+import { User, UserInvitation } from 'meta/user'
 
 import { BaseProtocol, DB } from 'server/db'
 import { ActivityLogRepository } from 'server/repository/public/activityLog'
 import { UserRepository } from 'server/repository/public/user'
-import { UserRoleRepository } from 'server/repository/public/userRole'
+import { UserInvitationRepository } from 'server/repository/public/userInvitation'
 
-export const removeInvitation = async (
-  props: {
-    countryIso: CountryIso
-    assessment: Assessment
-    cycle: Cycle
-    invitationUuid: string
-    user: User
-  },
-  client: BaseProtocol = DB
-): Promise<UserRole<RoleName>> => {
+type Props = {
+  countryIso: CountryIso
+  assessment: Assessment
+  cycle: Cycle
+  invitationUuid: string
+  user: User
+}
+
+export const removeInvitation = async (props: Props, client: BaseProtocol = DB): Promise<UserInvitation> => {
   const { countryIso, assessment, cycle, invitationUuid, user } = props
 
   return client.tx(async (t) => {
-    const userRole = await UserRoleRepository.remove({ invitationUuid }, t)
-
-    const invitedUser = await UserRepository.getOne({ id: userRole.userId })
+    const userInvitation = await UserInvitationRepository.remove({ invitationUuid }, t)
 
-    const { userId, role } = userRole
+    const invitedUser = await UserRepository.getOne({ uuid: userInvitation.userUuid })
+    const { userUuid, role } = userInvitation
 
-    await ActivityLogRepository.insertActivityLog(
-      {
-        activityLog: {
-          target: { userId, user: invitedUser.props.name, role },
-          section: 'users',
-          message: ActivityLogMessage.invitationRemove,
-          countryIso,
-          user,
-        },
-        assessment,
-        cycle,
-      },
-      t
-    )
+    const target = { userUuid, user: invitedUser.props.name, role }
+    const message = ActivityLogMessage.invitationRemove
+    const activityLog = { target, section: 'users', message, countryIso, user }
+    await ActivityLogRepository.insertActivityLog({ activityLog, assessment, cycle }, t)
 
-    return userRole
+    return userInvitation
   })
 }
diff --git a/src/server/controller/user/sendInvitationEmail.ts b/src/server/controller/user/sendInvitationEmail.ts
index c49c45a13b..4f16990b0a 100644
--- a/src/server/controller/user/sendInvitationEmail.ts
+++ b/src/server/controller/user/sendInvitationEmail.ts
@@ -1,5 +1,4 @@
-import { RoleName, UserRole } from 'meta/user'
-import { UserRoles } from 'meta/user/userRoles'
+import { UserInvitation, UserInvitations } from 'meta/user'
 
 import { BaseProtocol, DB } from 'server/db'
 import { UserRepository } from 'server/repository/public/user'
@@ -8,30 +7,27 @@ import { MailService } from 'server/service'
 
 import { AssessmentController } from '../assessment'
 
-export const sendInvitationEmail = async (
-  props: { invitationUuid: string },
-  client: BaseProtocol = DB
-): Promise<UserRole<RoleName>> => {
+type Props = { invitationUuid: string }
+
+export const sendInvitationEmail = async (props: Props, client: BaseProtocol = DB): Promise<UserInvitation> => {
   const { invitationUuid } = props
 
-  let userRole = await UserInvitationRepository.getOne({ invitationUuid }, client)
+  let userInvitation = await UserInvitationRepository.getOne({ invitationUuid }, client)
 
-  const { assessment, cycle } = await AssessmentController.getOneWithCycle({
-    id: userRole.assessmentId,
-    cycleUuid: userRole.cycleUuid,
-  })
+  const uuid = userInvitation.assessmentUuid
+  const { cycleUuid } = userInvitation
+  const { assessment, cycle } = await AssessmentController.getOneWithCycle({ uuid, cycleUuid })
 
-  if (UserRoles.isInvitationExpired(userRole)) userRole = await UserInvitationRepository.renew({ userRole })
+  if (UserInvitations.isExpired(userInvitation))
+    userInvitation = await UserInvitationRepository.renew({ invitation: userInvitation })
 
-  const userToInvite = await UserRepository.getOne({ id: userRole.userId }, client)
+  const userToInvite = await UserRepository.getOne({ uuid: userInvitation.userUuid }, client)
 
-  await MailService.userInvite({
-    countryIso: userRole.countryIso,
-    assessmentName: assessment.props.name,
-    cycleName: cycle.name,
-    role: userRole,
-    userToInvite,
-  })
+  const { countryIso } = userInvitation
+  const assessmentName = assessment.props.name
+  const cycleName = cycle.name
+  const mailProps = { countryIso, assessmentName, cycleName, userInvitation, userToInvite }
+  await MailService.userInvite(mailProps)
 
-  return userRole
+  return userInvitation
 }
diff --git a/src/server/controller/user/updateUserRoles.ts b/src/server/controller/user/updateUserRoles.ts
index 52a4188c55..64da605ae1 100644
--- a/src/server/controller/user/updateUserRoles.ts
+++ b/src/server/controller/user/updateUserRoles.ts
@@ -1,4 +1,4 @@
-import { ActivityLogMessage } from 'meta/assessment'
+import { ActivityLogMessage, CycleUuid } from 'meta/assessment'
 import { RoleName, User, UserRole } from 'meta/user'
 
 import { BaseProtocol, DB } from 'server/db'
@@ -6,32 +6,25 @@ import { ActivityLogRepository } from 'server/repository/public/activityLog'
 import { UserRepository } from 'server/repository/public/user'
 import { UserRoleRepository } from 'server/repository/public/userRole'
 
-export const updateUserRoles = async (
-  props: {
-    cycleUuid?: string
-    roles: Array<Partial<UserRole<RoleName>>>
-    userId: number
-    user: User
-  },
-  client: BaseProtocol = DB
-): Promise<User> => {
-  const { cycleUuid, roles, userId, user } = props
+type Props = {
+  cycleUuid?: CycleUuid
+  roles: Array<Partial<UserRole<RoleName>>>
+  userUuid: User['uuid']
+  user: User
+}
+
+export const updateUserRoles = async (props: Props, client: BaseProtocol = DB): Promise<User> => {
+  const { cycleUuid, roles, userUuid, user } = props
 
   return client.tx(async (t) => {
-    await UserRoleRepository.update({ cycleUuid, roles, userId }, t)
+    await UserRoleRepository.update({ cycleUuid, roles, userUuid }, t)
+
+    const target = { roles, userUuid }
+    const message = ActivityLogMessage.userRolesUpdate
+    const activityLog = { target, section: 'users', message, user }
 
-    await ActivityLogRepository.insertActivityLog(
-      {
-        activityLog: {
-          target: { roles, userId },
-          section: 'users',
-          message: ActivityLogMessage.userRolesUpdate,
-          user,
-        },
-      },
-      t
-    )
+    await ActivityLogRepository.insertActivityLog({ activityLog }, t)
 
-    return UserRepository.getOne({ id: userId, cycleUuid }, t)
+    return UserRepository.getOne({ uuid: userUuid, cycleUuid }, t)
   })
 }
diff --git a/src/server/repository/assessment/assessment/getCreateSchemaDDL.ts b/src/server/repository/assessment/assessment/getCreateSchemaDDL.ts
index 13df79c696..cc685cde90 100644
--- a/src/server/repository/assessment/assessment/getCreateSchemaDDL.ts
+++ b/src/server/repository/assessment/assessment/getCreateSchemaDDL.ts
@@ -1,3 +1,7 @@
+import { Assessment, Cycle } from 'meta/assessment'
+
+import { Schemas } from 'server/db'
+
 export const getCreateSchemaDDL = (schemaName: string): string => {
   const query = `
 create schema ${schemaName};
@@ -340,3 +344,72 @@ export const getCreateSchemaCycleOriginalDataPointViewDDL = (assessmentCycleSche
           order by odp.country_iso, odp.year
   `
 }
+
+export const getCreateOrReplaceViewCountryUserSummary = (props: { assessment: Assessment; cycle: Cycle }) => {
+  const { assessment, cycle } = props
+  const schemaName = Schemas.getNameCycle(assessment, cycle)
+  return `
+    create or replace view ${schemaName}.country_user_summary as
+    with filtered_roles as (
+        select 
+            ur.user_uuid,
+            ur.country_iso,
+            ur.uuid,
+            to_jsonb(ur.*) as role
+        from users_role ur
+        where (ur.cycle_uuid = '${cycle.uuid}' and
+               ur.assessment_uuid = '${assessment.uuid}')
+           or ur.role = 'ADMINISTRATOR'
+    ),
+    filtered_invitations as (
+        select 
+            ui.user_uuid,
+            ui.country_iso,
+            ui.uuid,
+            to_jsonb(ui.*) as invitation_data
+        from users_invitation ui
+        where ui.cycle_uuid = '${cycle.uuid}' 
+        and ui.assessment_uuid = '${assessment.uuid}'
+        -- only show pending invitations
+        and ui.accepted_at is null
+    ),
+    user_countries as (
+        select distinct user_uuid, country_iso
+        from (
+            select user_uuid, country_iso from filtered_roles
+            union all
+            select user_uuid, country_iso from filtered_invitations
+        ) combined
+    )
+    select 
+        u.uuid,
+        u.id,
+        uc.country_iso,
+        u.email,
+        u.props ->> 'name' as name,
+        u.props ->> 'surname' as surname,
+        concat(
+            coalesce(u.props ->> 'name', ''),
+            case when u.props ->> 'name' is not null and u.props ->> 'surname' is not null 
+                 then ' ' else '' end,
+            coalesce(u.props ->> 'surname', '')
+        ) as full_name,
+        u.status,
+        coalesce(u.props ->> 'lang', 'en') as lang,
+        ur.role as role,
+        case when ur.role is null then ui.invitation_data else null::jsonb end as invitation
+    from user_countries uc
+    join users u on u.uuid = uc.user_uuid
+    left join filtered_roles ur on u.uuid = ur.user_uuid 
+        and (ur.role->>'role' = 'ADMINISTRATOR' or ur.country_iso = uc.country_iso)
+    left join filtered_invitations ui on u.uuid = ui.user_uuid and ui.country_iso = uc.country_iso
+    order by 
+        u.uuid,
+        uc.country_iso,
+        lower(u.props ->> 'surname'),
+        lower(u.props ->> 'name'),
+        u.email;
+        
+    comment on view ${schemaName}.country_user_summary is 'Shows the user (as disaggregated) with their role or invitation by country/assessment/cycle';
+  `
+}
diff --git a/src/server/repository/assessment/assessment/getOne.ts b/src/server/repository/assessment/assessment/getOne.ts
index 7b90540678..b307bd626d 100644
--- a/src/server/repository/assessment/assessment/getOne.ts
+++ b/src/server/repository/assessment/assessment/getOne.ts
@@ -5,21 +5,50 @@ import { AssessmentAdapter } from 'server/repository/adapter'
 
 import { selectFields } from './selectFields'
 
-export const getOne = async (
-  props: { assessmentName: string; metaCache?: boolean } | { id: number; metaCache?: boolean },
-  client: BaseProtocol = DB
-): Promise<Assessment> => {
+type Props =
+  | {
+      assessmentName: string
+      metaCache?: boolean
+    }
+  | {
+      id: number
+      metaCache?: boolean
+    }
+  | {
+      uuid: string
+      metaCache?: boolean
+    }
+
+export const getOne = async (props: Props, client: BaseProtocol = DB): Promise<Assessment> => {
+  let whereClause: string
+  let queryValue: number | string
+
+  if ('id' in props) {
+    whereClause = 'a.id = $1'
+    queryValue = props.id
+  } else if ('uuid' in props) {
+    whereClause = 'a.uuid = $1'
+    queryValue = props.uuid
+  } else if ('assessmentName' in props) {
+    whereClause = "a.props->>'name' = $1"
+    queryValue = props.assessmentName
+  } else {
+    throw new Error('At least one of assessmentName, id, or uuid must be provided')
+  }
+
+  const { metaCache } = props
+
   return client.one(
     `
-        select ${selectFields},
-               jsonb_agg(to_jsonb(ac.*)) as cycles
-            ${props.metaCache ? `, meta_cache` : ''}
-        from assessment a
-                 left join assessment_cycle ac on a.id = ac.assessment_id
-        where ${'id' in props ? `a.id = $1` : `a.props->>'name' = $1`}
-        group by ${selectFields};
+    select ${selectFields},
+           jsonb_agg(to_jsonb(ac.*)) as cycles
+           ${metaCache ? ', meta_cache' : ''}
+    from assessment a
+    left join assessment_cycle ac on a.id = ac.assessment_id
+    where ${whereClause}
+    group by ${selectFields}
     `,
-    ['id' in props ? props.id : props.assessmentName],
+    [queryValue],
     AssessmentAdapter
   )
 }
diff --git a/src/server/repository/assessmentCycle/country/getMany.ts b/src/server/repository/assessmentCycle/country/getMany.ts
index 3a441a3730..b05ea4cb84 100644
--- a/src/server/repository/assessmentCycle/country/getMany.ts
+++ b/src/server/repository/assessmentCycle/country/getMany.ts
@@ -4,7 +4,6 @@ import { Country } from 'meta/area'
 import { Assessment, Cycle } from 'meta/assessment'
 
 import { BaseProtocol, DB, Schemas } from 'server/db'
-import { isAtlantisAllowed } from 'server/repository/assessmentCycle/country/isAtlantisAllowed'
 
 export const getMany = async (
   props: { assessment: Assessment; cycle: Cycle },
@@ -14,11 +13,6 @@ export const getMany = async (
 
   const cycleSchema = Schemas.getNameCycle(assessment, cycle)
 
-  let atlantis = ''
-  if (!isAtlantisAllowed(assessment, cycle)) {
-    atlantis = `where c.country_iso not like 'X%'`
-  }
-
   return client.map<Country>(
     `
         select c.*,
@@ -33,12 +27,10 @@ export const getMany = async (
                            on c.country_iso = cr.country_iso
                  left join ${cycleSchema}.country_summary cs
                            on c.country_iso = cs.country_iso
-                               ${atlantis}
         group by 1, 2, 3, 4, 5, 6, 7
         order by 1
     `,
     [cycle.uuid],
-    // @ts-ignore
-    Objects.camelize
+    (row) => Objects.camelize(row)
   )
 }
diff --git a/src/server/repository/assessmentCycle/country/isAtlantisAllowed.ts b/src/server/repository/assessmentCycle/country/isAtlantisAllowed.ts
deleted file mode 100644
index 70d61fa891..0000000000
--- a/src/server/repository/assessmentCycle/country/isAtlantisAllowed.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Assessment, Cycle } from 'meta/assessment'
-
-import { ProcessEnv } from 'server/utils'
-
-export const isAtlantisAllowed = (assessment: Assessment, cycle: Cycle) =>
-  ProcessEnv.fraAtlantisAllowed.find(
-    ({ assessmentName, cycleName }: { assessmentName: string; cycleName: string }) =>
-      assessmentName === assessment.props.name && cycleName === cycle.name
-  )
diff --git a/src/server/repository/assessmentCycle/countrySummary/createMaterializedView.ts b/src/server/repository/assessmentCycle/countrySummary/createMaterializedView.ts
index 6d21e4f59b..2e0490f867 100644
--- a/src/server/repository/assessmentCycle/countrySummary/createMaterializedView.ts
+++ b/src/server/repository/assessmentCycle/countrySummary/createMaterializedView.ts
@@ -49,37 +49,56 @@ export const createMaterializedView = async (props: Props, client: BaseProtocol
                    and a.section = 'assessment'
                    and a.message = '${ActivityLogMessage.assessmentStatusUpdate}'
                  group by 1, 2)
-           , user_summary as
-               (select c.country_iso,
-                       count(c.country_iso) filter ( where ur.invited_at is not null )           as invitations_sent_count,
-                       count(c.country_iso)
-                       filter ( where ur.invited_at is not null and ur.accepted_at is not null ) as invitations_accepted_count,
-                       count(c.country_iso)                                                      as users_count
-
-                from country c
-                         left join public.users_role ur
-                                   on c.country_iso = ur.country_iso
-                where ur.cycle_uuid = '${cycle.uuid}'
-                group by 1)
+           , user_roles as (
+               select ur.country_iso, ur.user_uuid
+               from public.users_role ur
+               where ur.cycle_uuid = '${cycle.uuid}'
+           ),
+           user_invitations as (
+               select ui.country_iso,
+                      ui.user_uuid,
+                      ui.invited_at,
+                      ui.accepted_at
+               from public.users_invitation ui
+               where ui.cycle_uuid = '${cycle.uuid}'
+           ),
+           unique_users as (
+               select user_uuid, country_iso
+               from (
+                    select user_uuid, country_iso from user_roles
+                    union
+                    select user_uuid, country_iso from user_invitations
+               ) combined_users
+           ),
+           user_summary as (
+               select c.country_iso,
+                      count(distinct ui.user_uuid) filter (where ui.invited_at is not null) as invitations_sent_count,
+                      count(distinct ui.user_uuid) filter (where ui.accepted_at is not null) as invitations_accepted_count,
+                      count(distinct uu.user_uuid) as users_count
+               from country c
+                    left join user_invitations ui on c.country_iso = ui.country_iso
+                    left join unique_users uu on c.country_iso = uu.country_iso
+               group by 1
+           )
       select c.country_iso
-             , le.last_edit
-             , leo.last_edit_odp_data
-             , lr.last_in_review
-             , lr.last_for_approval
-             , lr.last_accepted
-             , greatest(le.last_edit
-                 , leo.last_edit_odp_data
-                 , lr.last_in_review
-                 , lr.last_for_approval
-                 , lr.last_accepted)                      as last_update
-             , coalesce(us.invitations_accepted_count, 0) as invitations_accepted_count
-             , coalesce(us.invitations_sent_count, 0)     as invitations_sent_count
-             , coalesce(us.users_count, 0)                as users_count
-             , case
-                 when le.last_edit is null then '${AssessmentStatus.notStarted}'
-                 when c.status is null and le.last_edit is not null then '${AssessmentStatus.editing}'
-                 else c.status
-                 end                                    as status
+           , le.last_edit
+           , leo.last_edit_odp_data
+           , lr.last_in_review
+           , lr.last_for_approval
+           , lr.last_accepted
+           , greatest(le.last_edit
+               , leo.last_edit_odp_data
+               , lr.last_in_review
+               , lr.last_for_approval
+               , lr.last_accepted)                      as last_update
+           , coalesce(us.invitations_accepted_count, 0) as invitations_accepted_count
+           , coalesce(us.invitations_sent_count, 0)     as invitations_sent_count
+           , coalesce(us.users_count, 0)                as users_count
+           , case
+               when le.last_edit is null then '${AssessmentStatus.notStarted}'
+               when c.status is null and le.last_edit is not null then '${AssessmentStatus.editing}'
+               else c.status
+               end                                    as status
       from country c
                left join last_edit le on c.country_iso = le.country_iso
                left join last_edit_odp_data leo on c.country_iso = leo.country_iso
diff --git a/src/server/repository/assessmentCycle/cycle/create.ts b/src/server/repository/assessmentCycle/cycle/create.ts
index b421a0e968..c1c84505db 100644
--- a/src/server/repository/assessmentCycle/cycle/create.ts
+++ b/src/server/repository/assessmentCycle/cycle/create.ts
@@ -3,6 +3,7 @@ import { Assessment, AssessmentMetaCache, AssessmentNames, Cycle, CycleProps, Cy
 import { getOneWithCycle } from 'server/controller/assessment/getOne'
 import { BaseProtocol, DB, Schemas } from 'server/db'
 import { AssessmentRepository } from 'server/repository/assessment/assessment'
+import { getCreateOrReplaceViewCountryUserSummary } from 'server/repository/assessment/assessment/getCreateSchemaDDL'
 
 type Props = {
   assessment: Assessment
@@ -48,6 +49,9 @@ export const create = async (params: Props, client: BaseProtocol = DB): Returned
     [assessment.id, name, getDefaultProps()]
   )
 
+  // Init country user summary view
+  await client.query(getCreateOrReplaceViewCountryUserSummary({ assessment, cycle }))
+
   // Initialise meta_cache for assessment on cycle creation
   // cycle.uuid is required to initialise meta_cache
   await client.none(
diff --git a/src/server/repository/assessmentCycle/region/getRegionGroups.ts b/src/server/repository/assessmentCycle/region/getRegionGroups.ts
index 759c7fbb5f..949e252f5f 100644
--- a/src/server/repository/assessmentCycle/region/getRegionGroups.ts
+++ b/src/server/repository/assessmentCycle/region/getRegionGroups.ts
@@ -1,10 +1,9 @@
 import { Objects } from 'utils/objects'
 
-import { RegionCode, RegionGroup } from 'meta/area'
+import { RegionGroup } from 'meta/area'
 import { Assessment, Cycle } from 'meta/assessment'
 
 import { BaseProtocol, DB, Schemas } from 'server/db'
-import { isAtlantisAllowed } from 'server/repository/assessmentCycle/country/isAtlantisAllowed'
 
 export const getRegionGroups = async (
   props: { assessment: Assessment; cycle: Cycle },
@@ -13,12 +12,6 @@ export const getRegionGroups = async (
   const { assessment, cycle } = props
   const assessmentName = Schemas.getNameCycle(assessment, cycle)
 
-  let atlantis = ''
-
-  if (!isAtlantisAllowed(assessment, cycle)) {
-    atlantis = `where r.region_code != '${RegionCode.AT}'`
-  }
-
   const { regionGroups } = await client
     .one<RegionGroup>(
       `
@@ -36,7 +29,6 @@ export const getRegionGroups = async (
               from ${assessmentName}.region r
                        join ${assessmentName}.region_group rg on r.region_group_id = rg.id
                        left join region r2 on r.region_code = r2.region_code
-                  ${atlantis}
               group by rg.order, rg.id
           )
           select jsonb_object_agg(r."order", r.region_group) as region_groups
diff --git a/src/server/repository/public/ddl/getCreatePublicSchemaDDL.ts b/src/server/repository/public/ddl/getCreatePublicSchemaDDL.ts
index fa2a3bedfe..6996962c11 100644
--- a/src/server/repository/public/ddl/getCreatePublicSchemaDDL.ts
+++ b/src/server/repository/public/ddl/getCreatePublicSchemaDDL.ts
@@ -1,3 +1,60 @@
+export const getUsersRoleDDL = (schemaName = 'public'): string => {
+  return `
+    create table if not exists ${schemaName}.users_role (
+      id bigserial primary key,
+      uuid uuid default uuid_generate_v4(),
+      assessment_uuid uuid,
+      cycle_uuid uuid,
+      country_iso character varying(3),
+      user_uuid uuid not null,
+      role ${schemaName}.user_role not null,
+      props jsonb not null default '{}'::jsonb,
+      permissions jsonb not null default '{}'::jsonb,
+      invitation_uuid uuid,
+      created_at timestamp with time zone default now(),
+
+      foreign key (assessment_uuid) references ${schemaName}.assessment (uuid) on update cascade on delete cascade,
+      foreign key (user_uuid) references ${schemaName}.users (uuid) on update cascade on delete cascade,
+      foreign key (cycle_uuid) references ${schemaName}.assessment_cycle (uuid) on update cascade on delete cascade,
+      foreign key (country_iso) references ${schemaName}.country (country_iso) on update cascade on delete cascade,
+      foreign key (invitation_uuid) references ${schemaName}.users_invitation (uuid) on update cascade on delete set null
+    );
+    create unique index if not exists users_role_uuid_key on ${schemaName}.users_role using btree (uuid);
+    create unique index if not exists users_role_user_uuid_assessment_uuid_country_iso_cycle_uuid_uindex on ${schemaName}.users_role using btree (user_uuid, assessment_uuid, country_iso, cycle_uuid);
+    create index if not exists users_role_user_lookup_idx on ${schemaName}.users_role(user_uuid, cycle_uuid, assessment_uuid, role);
+  `
+}
+
+export const getUsersInvitationDDL = (schemaName = 'public'): string => {
+  return `
+    create table if not exists ${schemaName}.users_invitation (
+      id bigserial primary key,
+      uuid uuid default uuid_generate_v4(),
+      assessment_uuid uuid,
+      cycle_uuid uuid not null,
+      country_iso character varying(3),
+      user_uuid uuid not null,
+      invited_by_user_uuid uuid,
+      role ${schemaName}.user_role not null,
+      invited_at timestamp with time zone default now(),
+      accepted_at timestamp with time zone,
+      props jsonb not null default '{}'::jsonb,
+
+      foreign key (assessment_uuid) references ${schemaName}.assessment (uuid) on update cascade on delete cascade,
+      foreign key (user_uuid) references ${schemaName}.users (uuid) on update cascade on delete cascade,
+      foreign key (cycle_uuid) references ${schemaName}.assessment_cycle (uuid) on update cascade on delete cascade,
+      foreign key (country_iso) references ${schemaName}.country (country_iso) on update cascade on delete cascade,
+      foreign key (invited_by_user_uuid) references ${schemaName}.users (uuid) on update cascade on delete set null
+    );
+
+    create unique index if not exists users_invitation_uuid_key on ${schemaName}.users_invitation using btree (uuid);
+    create unique index if not exists users_invitation_assessment_cycle_country_uindex 
+      on ${schemaName}.users_invitation using btree (assessment_uuid, cycle_uuid, country_iso, user_uuid) 
+      where accepted_at is null;
+    create index if not exists users_invitation_user_lookup_idx on ${schemaName}.users_invitation(user_uuid, cycle_uuid, assessment_uuid);
+  `
+}
+
 export const getCreatePublicSchemaDDL = (schemaName = 'public'): string => {
   const query = `
     -- Extensions
@@ -68,6 +125,7 @@ export const getCreatePublicSchemaDDL = (schemaName = 'public'): string => {
         on update no action on delete no action
     );
     create unique index if not exists users_email_key on ${schemaName}.users using btree (email);
+    create unique index if not exists users_uuid_key on ${schemaName}.users using btree (uuid);
 
     create table if not exists ${schemaName}.activity_log (
       id bigserial primary key,
@@ -119,30 +177,9 @@ export const getCreatePublicSchemaDDL = (schemaName = 'public'): string => {
         on update no action on delete cascade
     );
 
-    create table if not exists ${schemaName}.users_role (
-      id bigserial primary key,
-      user_id bigint not null,
-      assessment_id bigint,
-      country_iso character varying(3),
-      role ${schemaName}.user_role not null,
-      props jsonb not null default '{}'::jsonb,
-      cycle_uuid uuid,
-      invitation_uuid uuid default uuid_generate_v4(),
-      invited_at timestamp with time zone default now(),
-      accepted_at timestamp with time zone,
-      permissions jsonb not null default '{}'::jsonb,
-      invited_by_user_uuid uuid,
-      foreign key (assessment_id) references ${schemaName}.assessment (id)
-        on update no action on delete cascade,
-      foreign key (user_id) references ${schemaName}.users (id)
-        on update no action on delete cascade,
-      foreign key (cycle_uuid) references ${schemaName}.assessment_cycle (uuid)
-        on update cascade on delete cascade,
-      foreign key (country_iso) references ${schemaName}.country (country_iso)
-        on update cascade on delete cascade
-    );
-    create unique index if not exists user_assessment_cycle_country_key on ${schemaName}.users_role using btree (user_id, assessment_id, cycle_uuid, country_iso);
-    create unique index if not exists users_role_user_id_assessment_id_country_iso_cycle_uuid_uindex on ${schemaName}.users_role using btree (user_id, assessment_id, country_iso, cycle_uuid);
+    ${getUsersInvitationDDL(schemaName)}
+    ${getUsersRoleDDL(schemaName)}
+
   `
 
   return query
diff --git a/src/server/repository/public/user/UserQueryParams.ts b/src/server/repository/public/user/UserQueryParams.ts
new file mode 100644
index 0000000000..8041659a7b
--- /dev/null
+++ b/src/server/repository/public/user/UserQueryParams.ts
@@ -0,0 +1,11 @@
+import { RoleName, UserStatus } from 'meta/user'
+
+export interface UserQueryParams {
+  fullName?: string
+  countries?: Array<string>
+  countryIso?: string
+  roles?: Array<RoleName>
+  statuses?: Array<UserStatus>
+  limit?: number
+  offset?: number
+}
diff --git a/src/server/repository/public/user/count.ts b/src/server/repository/public/user/count.ts
index 0a75fde689..7e54f3c5a6 100644
--- a/src/server/repository/public/user/count.ts
+++ b/src/server/repository/public/user/count.ts
@@ -1,69 +1,39 @@
-import { Objects } from 'utils/objects'
-
-import { CountryIso } from 'meta/area'
-import { Assessment, Cycle } from 'meta/assessment'
-import { RoleName, UserStatus } from 'meta/user'
-
-import { BaseProtocol, DB } from 'server/db'
-
-import { buildGetManyQuery } from './getMany'
-
-type Props = {
-  administrators?: boolean
-  assessment: Assessment
-  countries?: Array<CountryIso>
-  cycle: Cycle
-  fullName?: string
-  roles?: Array<RoleName>
-  statuses?: Array<UserStatus>
-}
-
-type Returned = {
-  total: number
-} & Record<RoleName, number>
-export const count = async (props: Props, client: BaseProtocol = DB): Promise<Returned> => {
-  const { assessment, countries, cycle, fullName, roles } = props
-
-  const conditions: Array<string> = []
-  if (Objects.isEmpty(countries)) conditions.push(`(ur.country_iso is null or ur.country_iso not like 'X%')`)
-  else conditions.push(`ur.country_iso in (${countries.map((countryIso) => `'${countryIso}'`).join(',')})`)
-
-  if (!Objects.isEmpty(roles)) conditions.push(`ur.role in (${roles.map((roleName) => `'${roleName}'`).join(',')})`)
-
-  if (!Objects.isEmpty(fullName))
-    conditions.push(`concat(u.props->'name', ' ', u.props->'surname') ilike '%${fullName}%'`)
-
-  const getQuery = (groupByRole?: boolean): string => {
-    return `select count(distinct (u.id)) as totals
-                ${groupByRole ? `, ur.role` : ''}
-            from public.users u
-                     join public.users_role ur on u.id = ur.user_id
-            where (ur.assessment_id is null or (ur.assessment_id = $1 and ur.cycle_uuid = $2))
-              -- and ((ur.accepted_at is not null and ur.invited_at is not null) or ur.invited_at is null)
-                and ${conditions.join(` 
-              and 
-              `)} ${groupByRole ? `group by ur.role` : ''}`
-  }
-
-  const queryRoles = `with counts as (${getQuery(true)})
-  select jsonb_object_agg(counts.role, counts.totals) as result
-  from counts`
-
-  const { query: subQueryTotals, queryParams: queryTotalsParams } = buildGetManyQuery(props)
-
-  const queryTotals = `
-  select count(*) as total
-  from (
-      ${subQueryTotals}
-  ) as users;
-  `
-
-  const total = await client.one<number>(queryTotals, queryTotalsParams, ({ total }) => total)
-  const roleTotals = await client.one<Record<RoleName, number>>(
-    queryRoles,
-    [assessment.id, cycle.uuid],
-    ({ result }) => result
-  )
-
-  return { total, ...roleTotals }
+import { Areas, CountryIso } from 'meta/area'
+import { RoleName } from 'meta/user'
+
+import { BaseProtocol, DB, Schemas } from 'server/db'
+
+import { getPropsToQueryParams } from './utils/getPropsToQueryParams'
+import { UsersGetManyProps } from './usersGetManyProps'
+
+type Returned = Record<RoleName | 'total', number>
+
+export const count = async (props: UsersGetManyProps, client: BaseProtocol = DB): Promise<Returned> => {
+  const { assessment, cycle } = props
+  const schemaName = Schemas.getNameCycle(assessment, cycle)
+
+  const { queryParams, whereConditions } = getPropsToQueryParams(props)
+
+  // Exclude atlantis countries from the count when not explicitly filtering for atlantis
+  if (!queryParams.countries?.every((countryIso: CountryIso) => Areas.isAtlantis(countryIso)))
+    whereConditions.push(`(cus.country_iso is null or cus.country_iso not like 'X%')`)
+
+  const queryRoles = `
+      with filtered_users as
+               (select distinct uuid
+                from ${schemaName}.country_user_summary cus
+                where ${whereConditions.join(' and ')}),
+           counts as
+               (select count(distinct (id)) as totals, coalesce(role ->> 'role', invitation ->> 'role') as role
+                from ${schemaName}.country_user_summary cus
+                where ${whereConditions.join(' and ')}
+                group by coalesce(role ->> 'role', invitation ->> 'role')
+                union all
+                -- add row "total" that describes the total count of unique users
+                select count(uuid) as total, 'total' as role
+                from filtered_users)
+      select jsonb_object_agg(counts.role, counts.totals) as result
+      from counts`
+
+  return client.one<Returned>(queryRoles, queryParams, ({ result }) => result)
 }
diff --git a/src/server/repository/public/user/getAdmins.ts b/src/server/repository/public/user/getAdmins.ts
index 2a8273d400..e505a427eb 100644
--- a/src/server/repository/public/user/getAdmins.ts
+++ b/src/server/repository/public/user/getAdmins.ts
@@ -18,7 +18,7 @@ export const getAdmins = async (
     `
       select ${selectFields}, jsonb_agg(to_jsonb(ur.*) - 'props') as roles
       from public.users u
-              join public.users_role ur on (u.id = ur.user_id)
+              join public.users_role ur on (u.uuid = ur.user_uuid)
       where ur.role = '${RoleName.ADMINISTRATOR}'
         and u.status in ($1:list)
       group by ${selectFields}
diff --git a/src/server/repository/public/user/getContacts.ts b/src/server/repository/public/user/getContacts.ts
index ec44d31fb5..d00fd55ff7 100644
--- a/src/server/repository/public/user/getContacts.ts
+++ b/src/server/repository/public/user/getContacts.ts
@@ -48,13 +48,14 @@ export const getContacts = async (props: Props, client: BaseProtocol = DB): Prom
                            else ur.permissions
                           end) -> 'sections')) as section
            from public.users u
-                    left join public.users_role ur on (u.id = ur.user_id)
+                    left join public.users_role ur on (u.uuid = ur.user_uuid)
            where ur.role in ($4:list)
              and ur.country_iso = $3
              and ur.cycle_uuid = $2
-             and ur.assessment_id = $1
+             and ur.assessment_uuid = $1
              and u.status = 'active'
-             and ((ur.accepted_at is not null and ur.invited_at is not null) or ur.invited_at is null))
+               -- all roles but admin
+             and (ur.created_at is not null))
          , users as
           (select u.id
                 , u.uuid
@@ -94,7 +95,7 @@ export const getContacts = async (props: Props, client: BaseProtocol = DB): Prom
       order by role_order, u.props ->> 'surname', u.props ->> 'name'
   `
 
-  const queryParams = [assessment.id, cycle.uuid, countryIso, roles]
+  const queryParams = [assessment.uuid, cycle.uuid, countryIso, roles]
 
   return client.map<Contact>(query, queryParams, (row) => Objects.camelize(row))
 }
diff --git a/src/server/repository/public/user/getMany.ts b/src/server/repository/public/user/getMany.ts
index d1e3308fde..1d3fc74e15 100644
--- a/src/server/repository/public/user/getMany.ts
+++ b/src/server/repository/public/user/getMany.ts
@@ -1,142 +1,53 @@
 import { Objects } from 'utils/objects'
 
-import { CountryIso } from 'meta/area'
-import { Assessment, Cycle } from 'meta/assessment'
 import { TablePaginatedOrderByDirection } from 'meta/tablePaginated'
-import { RoleName, User, UserStatus } from 'meta/user'
+import { User } from 'meta/user'
 
-import { BaseProtocol, DB } from 'server/db'
-import { UserRoleAdapter } from 'server/repository/adapter'
+import { BaseProtocol, DB, Schemas } from 'server/db'
+import { UsersGetManyProps } from 'server/repository/public/user/usersGetManyProps'
+import { getPropsToQueryParams } from 'server/repository/public/user/utils/getPropsToQueryParams'
 
-import { fields } from './fields'
+import { UserQueryParams } from './UserQueryParams'
 
-const selectFields = fields.map((f) => `u.${f}`).join(',')
-
-export type UsersGetManyProps = {
-  assessment?: Assessment
-  cycle?: Cycle
-  countryIso?: CountryIso
-
-  administrators?: boolean
-  countries?: Array<CountryIso>
-  fullName?: string
-  roles?: Array<RoleName>
-  statuses?: Array<UserStatus>
-
-  limit?: number
-  offset?: number
-
-  orderBy?: string
-  orderByDirection?: TablePaginatedOrderByDirection
-}
-
-type BuildQueryReturned = { query: string; queryParams: Array<string | number> }
+type BuildQueryReturned = { query: string; queryParams: UserQueryParams }
 
 const _getOrderClause = (
-  orderBy: string | undefined,
-  orderByDirection: TablePaginatedOrderByDirection | undefined
+  orderBy: string | undefined = 'full_name',
+  orderByDirection: TablePaginatedOrderByDirection = TablePaginatedOrderByDirection.asc
 ): string => {
-  const orderByName = "order by concat(u.props->'name', ' ', u.props->'surname')"
-
-  if (Objects.isEmpty(orderBy)) return `${orderByName} ${TablePaginatedOrderByDirection.asc}`
-
-  const direction = orderByDirection ?? TablePaginatedOrderByDirection.asc
-  if (orderBy === 'name') {
-    return `${orderByName} ${direction}`
-  }
-  return `order by ${orderBy} ${direction}`
+  return `order by
+    ${orderBy} ${orderByDirection}`
 }
 
 export const buildGetManyQuery = (props: UsersGetManyProps): BuildQueryReturned => {
-  const {
-    countryIso,
-    assessment,
-    cycle,
-    limit,
-    offset,
-    countries,
-    fullName,
-    roles,
-    administrators,
-    statuses = [UserStatus.active, UserStatus.invitationPending],
-    orderBy,
-    orderByDirection,
-  } = props
-
-  const selectedCountries = !Objects.isEmpty(countries)
-    ? countries.map((countryIso) => `'${countryIso}'`).join(',')
-    : null
-
-  const selectedRoles = !Objects.isEmpty(roles) ? roles.map((roleName) => `'${roleName}'`).join(',') : null
-
-  const whereConditions: Array<string> = []
-
-  if (administrators) {
-    whereConditions.push(`(
-    (ur.assessment_id = $1
-    and ur.cycle_uuid = $2
-    and ((accepted_at is not null and invited_at is not null) or invited_at is null)
-    )
-   or (ur.role = '${RoleName.ADMINISTRATOR}')
-    )`)
-  } else {
-    whereConditions.push('ur.assessment_id = $1')
-    whereConditions.push('ur.cycle_uuid = $2')
-  }
-
-  if (selectedCountries) {
-    whereConditions.push(`ur.country_iso in (${selectedCountries})`)
-  }
-
-  if (selectedRoles) {
-    whereConditions.push(`ur.role in (${selectedRoles})`)
-  }
-
-  if (fullName) {
-    whereConditions.push(`concat(u.props->'name', ' ', u.props->'surname') ilike '%${fullName}%'`)
-  }
-
-  if (statuses) {
-    whereConditions.push(`u.status in (${statuses.map((status) => `'${status}'`).join(',')})`)
-  }
-
-  if (countryIso) {
-    whereConditions.push(`u.id in (
-    select user_id
-    from public.users_role
-    where assessment_id = $1
-      and cycle_uuid = $2
-      and country_iso = $3
-    )`)
-  }
+  const { assessment, cycle, orderBy, orderByDirection } = props
 
   const order = _getOrderClause(orderBy, orderByDirection)
 
+  const { queryParams, whereConditions } = getPropsToQueryParams(props)
+
+  const schemaName = Schemas.getNameCycle(assessment, cycle)
   const query = `
-      select ${selectFields}, jsonb_agg(to_jsonb(ur.*) - 'props') as roles
-      from public.users u
-               join public.users_role ur on (u.id = ur.user_id)
-      where ${whereConditions.join(`
-      and
-      `)}
-      group by ${selectFields}
-                   ${order}
-                   ${limit ? `limit ${limit}` : ''}
-                   ${offset ? `offset ${offset}` : ''}
+  select 
+      cus.id,
+      cus.uuid,
+      cus.full_name,
+      cus.email,
+      cus.lang,
+      coalesce(jsonb_agg(cus.role) filter ( where cus.role is not null ), '[]') as roles,
+      coalesce(jsonb_agg(cus.invitation) filter ( where cus.invitation is not null ), '[]') as invitations
+    from ${schemaName}.country_user_summary cus
+    where ${whereConditions.join(' and ')}
+    group by cus.id, cus.uuid, cus.full_name, cus.email, cus.lang
+    ${order}
+    ${queryParams.limit ? `limit $(limit)` : ''}
+    ${queryParams.offset ? `offset $(offset)` : ''}
   `
-
-  const queryParams = countryIso ? [assessment.id, cycle.uuid, countryIso] : [assessment.id, cycle.uuid]
-
   return { query, queryParams }
 }
 
 export const getMany = async (props: UsersGetManyProps, client: BaseProtocol = DB): Promise<Array<User>> => {
   const { query, queryParams } = buildGetManyQuery(props)
 
-  return client.manyOrNone<User>(query, queryParams).then((data) =>
-    data.map(({ roles, ...user }) => ({
-      ...Objects.camelize(user),
-      roles: roles.map(UserRoleAdapter),
-    }))
-  )
+  return client.map<User>(query, queryParams, (row) => Objects.camelize(row))
 }
diff --git a/src/server/repository/public/user/getOne.ts b/src/server/repository/public/user/getOne.ts
index 03fbf4d8a1..72ffc1080c 100644
--- a/src/server/repository/public/user/getOne.ts
+++ b/src/server/repository/public/user/getOne.ts
@@ -4,7 +4,6 @@ import { User, UserStatus } from 'meta/user'
 
 import { BaseProtocol, DB } from 'server/db'
 import { UserRoleAdapter } from 'server/repository/adapter'
-import { ProcessEnv } from 'server/utils'
 
 import { fields } from './fields'
 
@@ -12,12 +11,11 @@ const selectFields = fields.map((f) => `u.${f}`).join(',')
 
 type Props = ({ id: number } | { uuid: string } | { email: string } | { emailGoogle: string }) & {
   allowDisabled?: boolean
-  allowedCountriesOnly?: boolean
   cycleUuid?: string
 }
 
 export const getOne = async (props: Props, client: BaseProtocol = DB): Promise<User> => {
-  const { allowDisabled, allowedCountriesOnly = true } = props
+  const { allowDisabled } = props
   const where = []
   let join = ''
   const values = []
@@ -53,39 +51,12 @@ export const getOne = async (props: Props, client: BaseProtocol = DB): Promise<U
     where.push(`and u.status in (${allowed.map((status) => `'${status}'`).join(',')})`)
   }
 
-  let usersRoleSubquery = ''
-
-  if (allowedCountriesOnly) {
-    const allowedAtlantisCycles: Array<string> = []
-    ProcessEnv.fraAtlantisAllowed.forEach(
-      ({ assessmentName, cycleName }: { assessmentName: string; cycleName: string }) =>
-        allowedAtlantisCycles.push(`(c.name = '${cycleName}' AND a.props->>'name' = '${assessmentName}')`)
-    )
-    if (allowedAtlantisCycles.length > 0) {
-      usersRoleSubquery = `
-      (
-        select ur_sub.*
-        from users_role ur_sub
-        left join public.assessment_cycle c on ur_sub.cycle_uuid = c.uuid
-        left join public.assessment a on a.id = ur_sub.assessment_id
-        where (
-          (c.name is null or a.props->>'name' is null or 
-           ${allowedAtlantisCycles.join(' or ')}
-          )
-          or ur_sub.country_iso not like 'X%'
-        )
-      ) AS `
-    }
-  }
-
   return client
     .oneOrNone<User>(
       `
         select ${selectFields}, jsonb_agg(to_jsonb(ur.*)) as roles
         from public.users u
-        left join ${
-          usersRoleSubquery.length > 0 ? usersRoleSubquery : 'users_role'
-        } ur on u.id = ur.user_id and (ur.accepted_at is not null or ur.invited_at is null or ur.role = 'ADMINISTRATOR') ${join}
+        left join users_role ur on u.uuid = ur.user_uuid ${join}
         where ${where.join(' ')}
         group by ${selectFields}
     `,
diff --git a/src/server/repository/public/user/index.ts b/src/server/repository/public/user/index.ts
index 9939f60cc0..dfe6c7207f 100644
--- a/src/server/repository/public/user/index.ts
+++ b/src/server/repository/public/user/index.ts
@@ -1,8 +1,10 @@
+import { UsersGetManyProps } from 'server/repository/public/user/usersGetManyProps'
+
 import { count } from './count'
 import { create } from './create'
 import { getAdmins } from './getAdmins'
 import { getContacts } from './getContacts'
-import { buildGetManyQuery, getMany, UsersGetManyProps } from './getMany'
+import { buildGetManyQuery, getMany } from './getMany'
 import { getOne } from './getOne'
 import { getProfilePicture } from './getProfilePicture'
 import { readCountryUsersByRole } from './readCountryUsersByRole'
diff --git a/src/server/repository/public/user/readCountryUsersByRole.ts b/src/server/repository/public/user/readCountryUsersByRole.ts
index 6c04a06f72..77f0facad5 100644
--- a/src/server/repository/public/user/readCountryUsersByRole.ts
+++ b/src/server/repository/public/user/readCountryUsersByRole.ts
@@ -24,7 +24,7 @@ export const readCountryUsersByRole = async (
   return client.map<User>(
     `
         select ${selectFields}, jsonb_agg(to_jsonb(ur.*)) as roles
-        from public.users u join users_role ur on (u.id = ur.user_id)
+        from public.users u join users_role ur on (u.uuid = ur.user_uuid)
         where ur.country_iso in ($1:csv) and ur.role in ($2:csv) and ur.cycle_uuid = $3
         group by ${selectFields}
 
diff --git a/src/server/repository/public/user/usersGetManyProps.ts b/src/server/repository/public/user/usersGetManyProps.ts
new file mode 100644
index 0000000000..7b5fb0561e
--- /dev/null
+++ b/src/server/repository/public/user/usersGetManyProps.ts
@@ -0,0 +1,17 @@
+import { CountryIso } from 'meta/area'
+import { Assessment, Cycle } from 'meta/assessment'
+import { TablePaginatedOrderByDirection, UserFilters } from 'meta/tablePaginated'
+
+export type UsersGetManyProps = {
+  assessment?: Assessment
+  cycle?: Cycle
+  countryIso?: CountryIso
+
+  filters?: UserFilters
+
+  limit?: number
+  offset?: number
+
+  orderBy?: string
+  orderByDirection?: TablePaginatedOrderByDirection
+}
diff --git a/src/server/repository/public/user/utils/getPropsToQueryParams.ts b/src/server/repository/public/user/utils/getPropsToQueryParams.ts
new file mode 100644
index 0000000000..919fd23181
--- /dev/null
+++ b/src/server/repository/public/user/utils/getPropsToQueryParams.ts
@@ -0,0 +1,49 @@
+import { Objects } from 'utils/objects'
+
+import { RoleName, UserStatus } from 'meta/user'
+
+import { UserQueryParams } from 'server/repository/public/user/UserQueryParams'
+import { UsersGetManyProps } from 'server/repository/public/user/usersGetManyProps'
+
+type Returned = { whereConditions: Array<string>; queryParams: UserQueryParams }
+
+export const getPropsToQueryParams = (props: UsersGetManyProps): Returned => {
+  const { countryIso, filters = {}, limit, offset } = props
+
+  const { administrators, countries, fullName, roles, disabled } = filters
+  const statuses = disabled ? [UserStatus.disabled] : [UserStatus.active]
+
+  const queryParams: UserQueryParams = {}
+
+  if (fullName) queryParams.fullName = fullName.trim().toLowerCase()
+  if (countryIso) queryParams.countryIso = countryIso
+  const hasCountries = !Objects.isEmpty(countries)
+  if (hasCountries) queryParams.countries = countries
+
+  const allRoles = administrators
+    ? Object.values(RoleName)
+    : Object.values(RoleName).filter((role) => role !== RoleName.ADMINISTRATOR)
+
+  const selectedRoles = !Objects.isEmpty(roles) ? roles : allRoles
+  if (selectedRoles) queryParams.roles = selectedRoles
+
+  queryParams.statuses = statuses
+
+  if (!Objects.isNil(limit)) queryParams.limit = limit
+  if (!Objects.isNil(offset)) queryParams.offset = offset
+
+  const whereConditions = [
+    fullName && `full_name ilike '%' || $(fullName) || '%'`,
+    selectedRoles &&
+      `(
+      (role is not null and role ->> 'role' in ($(roles:list)))
+      or 
+      (invitation is not null and invitation ->> 'role' in ($(roles:list)))
+    )`,
+    countryIso && `country_iso = $(countryIso)`,
+    hasCountries && `country_iso in ($(countries:list))`,
+    `status in ($(statuses:list))`,
+  ].filter(Boolean)
+
+  return { queryParams, whereConditions }
+}
diff --git a/src/server/repository/public/userInvitation/accept.ts b/src/server/repository/public/userInvitation/accept.ts
new file mode 100644
index 0000000000..cf7c30a752
--- /dev/null
+++ b/src/server/repository/public/userInvitation/accept.ts
@@ -0,0 +1,23 @@
+import { Objects } from 'utils/objects'
+
+import { UserInvitation } from 'meta/user'
+
+import { BaseProtocol, DB } from 'server/db'
+
+type Props = {
+  userInvitation: UserInvitation
+}
+
+export const accept = async (props: Props, client: BaseProtocol = DB): Promise<UserInvitation> => {
+  const { userInvitation } = props
+  return client.one(
+    `
+    update public.users_invitation
+    set accepted_at = now()
+    where uuid = $1
+    returning *
+    `,
+    [userInvitation.uuid],
+    (row) => Objects.camelize(row)
+  )
+}
diff --git a/src/server/repository/public/userInvitation/create.ts b/src/server/repository/public/userInvitation/create.ts
new file mode 100644
index 0000000000..08440ad59e
--- /dev/null
+++ b/src/server/repository/public/userInvitation/create.ts
@@ -0,0 +1,30 @@
+import { Objects } from 'utils/objects'
+
+import { CountryIso } from 'meta/area'
+import { Assessment, Cycle } from 'meta/assessment'
+import { RoleName, User, UserInvitation } from 'meta/user'
+
+import { BaseProtocol } from 'server/db'
+import { DB } from 'server/db/db'
+
+type Props = {
+  assessment: Assessment
+  cycle: Cycle
+  countryIso: CountryIso
+  invitedBy: User
+  //   props: never
+  role: RoleName
+  user: User
+}
+
+export const create = async (props: Props, client: BaseProtocol = DB) => {
+  const { assessment, cycle, countryIso, invitedBy, role, user } = props
+
+  return client.one<UserInvitation>(
+    `
+    insert into users_invitation (assessment_uuid, cycle_uuid, country_iso, invited_by_user_uuid, user_uuid, role) values ($1, $2, $3, $4, $5, $6) returning *;
+    `,
+    [assessment.uuid, cycle.uuid, countryIso, invitedBy.uuid, user.uuid, role],
+    (row) => Objects.camelize(row)
+  )
+}
diff --git a/src/server/repository/public/userInvitation/getCount.ts b/src/server/repository/public/userInvitation/getCount.ts
index eb3c2ec97c..b53e00a652 100644
--- a/src/server/repository/public/userInvitation/getCount.ts
+++ b/src/server/repository/public/userInvitation/getCount.ts
@@ -15,13 +15,12 @@ export const getCount = async (props: Props, client: BaseProtocol = DB): Promise
 
   return client.one<TablePaginatedCount>(
     `
-        select count(ur.id) as total
-        from users_role ur
-                 left join public.assessment a on ur.assessment_id = a.id
-                 left join public.assessment_cycle ac on ur.cycle_uuid = ac.uuid and a.id = ac.assessment_id
+        select count(ui.uuid) as total
+        from users_invitation ui
+                 left join public.assessment a on ui.assessment_uuid = a.uuid
+                 left join public.assessment_cycle ac on ui.cycle_uuid = ac.uuid and a.id = ac.assessment_id
         where a.id = $1
           and ac.id = $2
-          and ur.invitation_uuid is not null
     `,
     [assessment.id, cycle.id],
     (res) => Objects.camelize(res)
diff --git a/src/server/repository/public/userInvitation/getMany.ts b/src/server/repository/public/userInvitation/getMany.ts
index a33de438a4..d9d42945fa 100644
--- a/src/server/repository/public/userInvitation/getMany.ts
+++ b/src/server/repository/public/userInvitation/getMany.ts
@@ -1,5 +1,6 @@
 import { Objects } from 'utils/objects'
 
+import { CountryIso } from 'meta/area'
 import { Assessment, Cycle } from 'meta/assessment'
 import { TablePaginatedOrderByDirection } from 'meta/tablePaginated'
 import { UserInvitationSummary } from 'meta/user/userInvitationSummary'
@@ -9,30 +10,43 @@ import { BaseProtocol, DB } from 'server/db'
 type Props = {
   assessment: Assessment
   cycle: Cycle
-  limit: string
-  offset: string
+  countryIso?: CountryIso
+  limit?: string
+  offset?: string
   orderBy?: string
   orderByDirection?: TablePaginatedOrderByDirection
 }
 
 export const getMany = async (props: Props, client: BaseProtocol = DB): Promise<Array<UserInvitationSummary>> => {
-  const { assessment, cycle, limit, offset, orderBy, orderByDirection } = props
+  const { assessment, cycle, countryIso, limit, offset, orderBy, orderByDirection } = props
+
+  const params: Record<string, string | number | boolean> = {
+    assessmentId: assessment.id,
+    cycleId: cycle.id,
+  }
+
+  if (countryIso) params.countryIso = countryIso
+  if (limit) params.limit = limit
+  if (offset) params.offset = offset
 
   return client.map<UserInvitationSummary>(
     `
-        select ur.*,
-               u.email
-        from users_role ur
-                 left join public.users u on ur.user_id = u.id
-                 left join public.assessment a on ur.assessment_id = a.id
-                 left join public.assessment_cycle ac on ur.cycle_uuid = ac.uuid and a.id = ac.assessment_id
-        where a.id = $1
-          and ac.id = $2
-          and ur.invitation_uuid is not null
+        select ui.*,
+               u.email,
+               concat(u.props ->> 'name', ' ', u.props ->> 'surname') as name,
+               coalesce(u.props ->> 'lang', 'en') as lang
+        from users_invitation ui
+                 left join public.users u on ui.user_uuid = u.uuid
+                 left join public.assessment a on ui.assessment_uuid = a.uuid
+                 left join public.assessment_cycle ac on ui.cycle_uuid = ac.uuid and a.id = ac.assessment_id
+        where a.id = $(assessmentId)
+          and ac.id = $(cycleId)
+          ${countryIso ? 'and ui.country_iso = $(countryIso)' : ''}
         order by ${orderBy ?? 'country_iso'} ${orderByDirection ?? TablePaginatedOrderByDirection.asc} nulls last
-        limit $3 offset $4
+        ${limit ? 'limit $(limit)' : ''}
+        ${offset ? 'offset $(offset)' : ''}
     `,
-    [assessment.id, cycle.id, limit, offset],
+    params,
     (row) => Objects.camelize(row)
   )
 }
diff --git a/src/server/repository/public/userInvitation/getOne.ts b/src/server/repository/public/userInvitation/getOne.ts
index 3bfc3caf9c..d9a2cd83d6 100644
--- a/src/server/repository/public/userInvitation/getOne.ts
+++ b/src/server/repository/public/userInvitation/getOne.ts
@@ -1,18 +1,15 @@
 import { Objects } from 'utils/objects'
 
-import { RoleName, UserRole } from 'meta/user'
+import { UserInvitation } from 'meta/user'
 
 import { BaseProtocol, DB } from 'server/db'
 
-export const getOne = async (
-  props: { invitationUuid: string },
-  client: BaseProtocol = DB
-): Promise<UserRole<RoleName>> => {
+export const getOne = async (props: { invitationUuid: string }, client: BaseProtocol = DB): Promise<UserInvitation> => {
   const { invitationUuid } = props
 
-  return client.oneOrNone<UserRole<RoleName>>(
+  return client.oneOrNone<UserInvitation>(
     `
-        select * from users_role where invitation_uuid = $1
+        select * from users_invitation where uuid = $1
     `,
     [invitationUuid],
     Objects.camelize
diff --git a/src/server/repository/public/userInvitation/index.ts b/src/server/repository/public/userInvitation/index.ts
index b049f48b08..f476baf2de 100644
--- a/src/server/repository/public/userInvitation/index.ts
+++ b/src/server/repository/public/userInvitation/index.ts
@@ -1,11 +1,17 @@
+import { accept } from './accept'
+import { create } from './create'
 import { getCount } from './getCount'
 import { getMany } from './getMany'
 import { getOne } from './getOne'
+import { remove } from './remove'
 import { renew } from './renew'
 
 export const UserInvitationRepository = {
+  accept,
+  create,
   getCount,
   getMany,
   getOne,
+  remove,
   renew,
 }
diff --git a/src/server/repository/public/userInvitation/remove.ts b/src/server/repository/public/userInvitation/remove.ts
new file mode 100644
index 0000000000..4e6f331fad
--- /dev/null
+++ b/src/server/repository/public/userInvitation/remove.ts
@@ -0,0 +1,25 @@
+import { Objects } from 'utils/objects'
+
+import { UserInvitation } from 'meta/user'
+
+import { BaseProtocol } from 'server/db'
+import { DB } from 'server/db/db'
+
+type Props = {
+  invitationUuid: UserInvitation['uuid']
+}
+
+export const remove = async (props: Props, client: BaseProtocol = DB) => {
+  const { invitationUuid } = props
+
+  return client.one<UserInvitation>(
+    `
+        delete
+        from public.users_invitation
+        where uuid = $1
+        returning *;
+`,
+    [invitationUuid],
+    (row) => Objects.camelize(row)
+  )
+}
diff --git a/src/server/repository/public/userInvitation/renew.ts b/src/server/repository/public/userInvitation/renew.ts
index b695b3548c..be69ab3285 100644
--- a/src/server/repository/public/userInvitation/renew.ts
+++ b/src/server/repository/public/userInvitation/renew.ts
@@ -1,20 +1,20 @@
 import { Objects } from 'utils/objects'
 
-import { RoleName, UserRole } from 'meta/user'
+import { UserInvitation } from 'meta/user'
 
 import { BaseProtocol, DB } from 'server/db'
 
 export const renew = async (
-  props: { userRole: UserRole<RoleName> },
+  props: { invitation: UserInvitation },
   client: BaseProtocol = DB
-): Promise<UserRole<RoleName>> => {
+): Promise<UserInvitation> => {
   const {
-    userRole: { id },
+    invitation: { uuid },
   } = props
 
-  return client.one<UserRole<RoleName>>(
-    'update users_role set invited_at = now() where id = $1 returning *;',
-    [id],
+  return client.one<UserInvitation>(
+    'update users_invitation set invited_at = now() where uuid = $1 returning *;',
+    [uuid],
     Objects.camelize
   )
 }
diff --git a/src/server/repository/public/userRole/acceptInvitation.ts b/src/server/repository/public/userRole/acceptInvitation.ts
deleted file mode 100644
index 678bfd89a3..0000000000
--- a/src/server/repository/public/userRole/acceptInvitation.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Objects } from 'utils/objects'
-
-import { RoleName, UserRole } from 'meta/user'
-
-import { BaseProtocol, DB } from 'server/db'
-
-export const acceptInvitation = async (
-  props: { userRole: UserRole<RoleName> },
-  client: BaseProtocol = DB
-): Promise<UserRole<RoleName>> => {
-  const {
-    userRole: { id },
-  } = props
-
-  return client.one<UserRole<RoleName>>(
-    'update users_role set accepted_at = now() where id = $1 returning *;',
-    [id],
-    Objects.camelize
-  )
-}
diff --git a/src/server/repository/public/userRole/create.ts b/src/server/repository/public/userRole/create.ts
index 3a1e67149e..5c354f9b57 100644
--- a/src/server/repository/public/userRole/create.ts
+++ b/src/server/repository/public/userRole/create.ts
@@ -2,43 +2,42 @@ import { Objects } from 'utils/objects'
 
 import { CountryIso } from 'meta/area'
 import { Assessment, Cycle } from 'meta/assessment'
-import { RoleName, User, UserRole } from 'meta/user'
+import { RoleName, User, UserInvitation, UserRole } from 'meta/user'
 import { CollaboratorPermissions, UserRoleBaseProps, UserRoleExtendedProps } from 'meta/user/userRole'
 
 import { BaseProtocol, DB } from 'server/db'
 
-export const create = async (
-  props: {
-    assessment: Pick<Assessment, 'id'>
-    country: CountryIso
-    cycle: Cycle
-    invitedByUserUuid: string
-    permissions?: CollaboratorPermissions
-    props?: UserRoleBaseProps | UserRoleExtendedProps
-    role: RoleName
-    user: Pick<User, 'id'>
-  },
-  client: BaseProtocol = DB
-): Promise<UserRole<RoleName>> => {
+type Props = {
+  assessmentUuid: Assessment['uuid']
+  cycleUuid: Cycle['uuid']
+  countryIso: CountryIso
+  userUuid: User['uuid']
+  role: UserInvitation['role']
+  props?: UserRoleBaseProps | UserRoleExtendedProps
+  permissions?: CollaboratorPermissions
+  invitationUuid?: UserInvitation['uuid']
+}
+
+export const create = async (props: Props, client: BaseProtocol = DB): Promise<UserRole<RoleName>> => {
   const {
-    assessment: { id: assessmentId },
-    country,
-    cycle,
-    invitedByUserUuid,
-    permissions,
-    props: properties,
+    assessmentUuid,
+    cycleUuid,
+    countryIso,
+    userUuid,
     role,
-    user: { id: userId },
+    props: roleProps = {},
+    permissions = {},
+    invitationUuid,
   } = props
 
   return client.one<UserRole<RoleName>>(
     `
         insert into public.users_role (
-            user_id, assessment_id, country_iso, role, props, cycle_uuid, permissions, invited_by_user_uuid)
+            assessment_uuid, cycle_uuid, country_iso, user_uuid, role, props, permissions, invitation_uuid)
             values ($1, $2, $3, $4, $5, $6, $7, $8)
             returning *;
     `,
-    [userId, assessmentId, country, role, properties ?? {}, cycle.uuid, permissions ?? {}, invitedByUserUuid],
+    [assessmentUuid, cycleUuid, countryIso, userUuid, role, roleProps, permissions, invitationUuid],
     Objects.camelize
   )
 }
diff --git a/src/server/repository/public/userRole/index.ts b/src/server/repository/public/userRole/index.ts
index 768b55e0dc..d24c18d3c5 100644
--- a/src/server/repository/public/userRole/index.ts
+++ b/src/server/repository/public/userRole/index.ts
@@ -1,14 +1,10 @@
-import { acceptInvitation } from './acceptInvitation'
 import { create } from './create'
-import { remove } from './remove'
 import { update } from './update'
 import { updateProps } from './updateProps'
 import { updateSectionAuth } from './updateSectionAuth'
 
 export const UserRoleRepository = {
-  acceptInvitation,
   create,
-  remove,
   update,
   updateProps,
   updateSectionAuth,
diff --git a/src/server/repository/public/userRole/remove.ts b/src/server/repository/public/userRole/remove.ts
deleted file mode 100644
index cac6e846ef..0000000000
--- a/src/server/repository/public/userRole/remove.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Objects } from 'utils/objects'
-
-import { RoleName, UserRole } from 'meta/user'
-
-import { BaseProtocol, DB } from 'server/db'
-
-export const remove = async (
-  props: { invitationUuid: string },
-  client: BaseProtocol = DB
-): Promise<UserRole<RoleName>> => {
-  const { invitationUuid } = props
-
-  return client.oneOrNone<UserRole<RoleName>>(
-    'delete from public.users_role where invitation_uuid = $1 returning *;',
-    [invitationUuid],
-    Objects.camelize
-  )
-}
diff --git a/src/server/repository/public/userRole/update.ts b/src/server/repository/public/userRole/update.ts
index 3976420bb3..28001cc7d7 100644
--- a/src/server/repository/public/userRole/update.ts
+++ b/src/server/repository/public/userRole/update.ts
@@ -3,11 +3,10 @@ import { RoleName, UserRole } from 'meta/user'
 
 import { BaseProtocol, DB } from 'server/db'
 
-export const update = async (
-  props: { cycleUuid?: string; roles: Array<Partial<UserRole<RoleName>>>; userId: number },
-  client: BaseProtocol = DB
-): Promise<void> => {
-  const { cycleUuid, roles, userId } = props
+type Props = { cycleUuid?: string; roles: Array<Partial<UserRole<RoleName>>>; userUuid: string }
+
+export const update = async (props: Props, client: BaseProtocol = DB): Promise<void> => {
+  const { cycleUuid, roles, userUuid } = props
 
   if (cycleUuid) {
     const doNotDelete: Array<number> = []
@@ -18,35 +17,16 @@ export const update = async (
       else if (curr.countryIso) newCountryRoles.push(curr.countryIso)
     })
 
-    const pendingInvitations = await client.map<number>(
-      `
-        select id from public.users_role
-        where user_id = $1 and cycle_uuid = $2
-        and invited_at is not null and accepted_at is null
-        ${
-          newCountryRoles.length !== 0
-            ? ` and country_iso not in (${newCountryRoles.map((countryRole) => `'${countryRole}'`).join(',')})`
-            : ''
-        }
-      `,
-      [userId, cycleUuid],
-      ({ id }) => id
-    )
-
-    pendingInvitations.forEach((id) => {
-      if (!doNotDelete.includes(id)) doNotDelete.push(id)
-    })
-
     await client.query(
       `
         delete from public.users_role
-        where user_id = $1 and cycle_uuid = $2
+        where user_uuid = $1 and cycle_uuid = $2
         ${doNotDelete.length !== 0 ? ` and id not in (${doNotDelete.join(',')})` : ''}
     `,
-      [userId, cycleUuid]
+      [userUuid, cycleUuid]
     )
   } else {
-    await client.query(`delete from public.users_role where user_id = $1`, [userId])
+    await client.query(`delete from public.users_role where user_uuid = $1`, [userUuid])
   }
 
   const userRolePromises = roles
@@ -54,11 +34,11 @@ export const update = async (
     .map((userRole: UserRole<RoleName>) =>
       client.query(
         `
-            insert into public.users_role (user_id, assessment_id, cycle_uuid, country_iso, role, accepted_at)
-            values ($1, $2, $3, $4, $5, now()) on conflict (user_id, assessment_id, cycle_uuid, country_iso) do update
+            insert into public.users_role (user_uuid, assessment_uuid, cycle_uuid, country_iso, role, created_at)
+            values ($1, $2, $3, $4, $5, now()) on conflict (user_uuid, assessment_uuid, cycle_uuid, country_iso) do update
             set role = $5
         `,
-        [userId, userRole.assessmentId, userRole.cycleUuid, userRole.countryIso, userRole.role]
+        [userUuid, userRole.assessmentUuid, userRole.cycleUuid, userRole.countryIso, userRole.role]
       )
     )
 
diff --git a/src/server/service/export/queryToCsvStream.ts b/src/server/service/export/queryToCsvStream.ts
index 1f6ebfb2b2..ae98569162 100644
--- a/src/server/service/export/queryToCsvStream.ts
+++ b/src/server/service/export/queryToCsvStream.ts
@@ -2,13 +2,14 @@ import QueryStream = require('pg-query-stream')
 import { pipeline, Transform } from 'stream'
 import * as fastCsv from 'fast-csv'
 import { ParserRow } from 'fast-csv'
-import { Client } from 'pg'
+import * as pgPromise from 'pg-promise'
 
 import { BaseProtocol, DB } from 'server/db'
+import { Logger } from 'server/utils/logger'
 
 export type QueryToCsvStreamProps<QueryResultRow> = {
   query: string
-  queryParams?: Parameters<Client['query']>[1]
+  queryParams?: unknown
   rowTransformer?: (row: QueryResultRow) => ParserRow
 }
 
@@ -19,8 +20,13 @@ export const queryToCsvStream = <QueryResultRow>(
   const { query, queryParams, rowTransformer } = props
 
   return new Promise((resolve, reject) => {
-    const queryStream = new QueryStream(query, queryParams)
+    let finalQuery = query
+    if (queryParams) {
+      const pgp = pgPromise()
+      finalQuery = pgp.as.format(query, queryParams)
+    }
 
+    const queryStream = new QueryStream(finalQuery, null)
     const csvStream = fastCsv.format({ headers: true })
 
     let transformStream: Transform | null = null
@@ -41,8 +47,9 @@ export const queryToCsvStream = <QueryResultRow>(
     client
       .stream(queryStream, (stream) => {
         // pipeline requires a cb function to be passed, even if it does nothing.
-        // eslint-disable-next-line @typescript-eslint/no-empty-function
-        const pipelineCallBack = (_err: NodeJS.ErrnoException) => {}
+        const pipelineCallBack = (_err: NodeJS.ErrnoException) => {
+          Logger.error(_err)
+        }
         if (transformStream) {
           resolve(pipeline(stream, transformStream, csvStream, pipelineCallBack))
         } else {
diff --git a/src/server/service/mail/userInvite.ts b/src/server/service/mail/userInvite.ts
index 7eff0e54cb..3647a70631 100644
--- a/src/server/service/mail/userInvite.ts
+++ b/src/server/service/mail/userInvite.ts
@@ -4,7 +4,7 @@ import { CountryIso } from 'meta/area'
 import { AssessmentName, Assessments } from 'meta/assessment'
 import { Lang } from 'meta/lang'
 import { Routes } from 'meta/routes'
-import { RoleName, User, UserRole, Users } from 'meta/user'
+import { User, UserInvitation, Users } from 'meta/user'
 
 import { ProcessEnv } from 'server/utils'
 
@@ -14,20 +14,20 @@ export const userInvite = async (props: {
   assessmentName: AssessmentName
   countryIso: CountryIso
   cycleName: string
-  role: UserRole<RoleName>
+  userInvitation: UserInvitation
   userToInvite: User
 }) => {
-  const { assessmentName, countryIso, cycleName, role, userToInvite } = props
+  const { assessmentName, countryIso, cycleName, userInvitation, userToInvite } = props
 
   const url = ProcessEnv.appUri
   const i18n = await createI18nPromise(userToInvite.props.lang ?? Lang.en)
 
   const link = `${url}${Routes.LoginInvitation.generatePath(
     { assessmentName, cycleName },
-    { invitationUuid: role.invitationUuid, lang: userToInvite.props.lang }
+    { invitationUuid: userInvitation.uuid, lang: userToInvite.props.lang }
   )}`
 
-  const roleName = i18n.t(Users.getI18nRoleLabelKey(role.role))
+  const roleName = i18n.t(Users.getI18nRoleLabelKey(userInvitation.role))
 
   const emailProps = {
     country: i18n.t(`area.${countryIso}.listName`),
diff --git a/src/server/service/mail/userNotifyAcceptedInvitation.ts b/src/server/service/mail/userNotifyAcceptedInvitation.ts
index e640917737..1b1f55d26a 100644
--- a/src/server/service/mail/userNotifyAcceptedInvitation.ts
+++ b/src/server/service/mail/userNotifyAcceptedInvitation.ts
@@ -23,7 +23,7 @@ export const userNotifyAcceptedInvitation = async (props: {
   const url = ProcessEnv.appUri
   const i18n = await createI18nPromise(recipient.props.lang ?? Lang.en)
 
-  const sectionName = SectionNames.Country.Home.userManagement
+  const sectionName = SectionNames.Country.Home.collaborators
   const manageCollaboratorsUrl = `${url}${Routes.CountryHomeSection.generatePath({
     assessmentName,
     cycleName,
diff --git a/src/server/utils/processEnv.ts b/src/server/utils/processEnv.ts
index 85aad3f34b..f19cd459fc 100644
--- a/src/server/utils/processEnv.ts
+++ b/src/server/utils/processEnv.ts
@@ -27,8 +27,10 @@ export const ProcessEnv = {
   logLevel: process.env.LOG_LEVEL ?? (process.env.DEBUG === 'true' ? 'debug' : 'error'),
 
   // fra
+  /**
+   * @deprecated Deprecation notice: This will be removed in future refactor
+   */
   fraReportCollaboratorsExcluded: JSON.parse(process.env.FRA_REPORT_COLLABORATORS_EXCLUDED ?? '[]'),
-  fraAtlantisAllowed: JSON.parse(process.env.FRA_ATLANTIS_ALLOWED ?? '[]'),
 
   invitationExpiryDays: Number(process.env.INVITATION_EXPIRY_DAYS) || 7,
 
diff --git a/src/test/integration/user/userInvite.ts b/src/test/integration/user/userInvite.ts
index 1ad8d1662f..b02ba5ecec 100644
--- a/src/test/integration/user/userInvite.ts
+++ b/src/test/integration/user/userInvite.ts
@@ -1,6 +1,6 @@
 import { Assessment, Cycle } from 'meta/assessment'
 import { Lang } from 'meta/lang'
-import { RoleName, User, UserRole, UserStatus } from 'meta/user'
+import { RoleName, User, UserInvitation, UserStatus } from 'meta/user'
 
 import { AssessmentController } from 'server/controller/assessment'
 import { UserController } from 'server/controller/user'
@@ -8,22 +8,30 @@ import { UserController } from 'server/controller/user'
 import { assessmentParams } from 'test/integration/mock/assessment'
 import { userMockTest, userMockUnknown } from 'test/integration/mock/user'
 
+type TestContext = {
+  assessment: Assessment
+  cycle: Cycle
+  user: User
+  userInvitation?: UserInvitation
+}
+
 export default (): void =>
   describe('User Invite', () => {
-    let assessment: Assessment
-    let cycle: Cycle
-    let user: User
-    let userRole: UserRole<RoleName>
+    const testContext: TestContext = {
+      assessment: undefined,
+      cycle: undefined,
+      user: undefined,
+    }
 
     beforeAll(async () => {
-      assessment = await AssessmentController.getOne({ assessmentName: assessmentParams.props.name })
-      const [first] = assessment.cycles
-      cycle = first
-      user = await UserController.getOne({ email: userMockTest.email })
+      testContext.assessment = await AssessmentController.getOne({ assessmentName: assessmentParams.props.name })
+      testContext.cycle = testContext.assessment.cycles.at(0)
+      testContext.user = await UserController.getOne({ email: userMockTest.email })
     })
 
     it('Invite new user as Collaborator', async () => {
-      const { userRole, user: invitedUser } = await UserController.invite({
+      const { assessment, cycle, user } = testContext
+      const { userInvitation, user: invitedUser } = await UserController.invite({
         assessment,
         countryIso: 'X01',
         cycle,
@@ -33,21 +41,34 @@ export default (): void =>
         lang: Lang.en,
       })
 
-      // verify invitation exists
-      expect(userRole).toHaveProperty('invitationUuid')
+      // verify user invitation exists and fields are correct
+      expect(userInvitation).toBeDefined()
+      expect(userInvitation.invitedByUserUuid).toBe(user.uuid)
+      expect(userInvitation.role).toBe(RoleName.COLLABORATOR)
+      expect(userInvitation.countryIso).toBe('X01')
       // verify user status is invitationPending
       expect(invitedUser.status).toBe(UserStatus.invitationPending)
-      // User accepts invitation with his own email and password
-      expect(userRole.acceptedAt).toBeNull()
+      // verify no active role exists yet
+      expect(invitedUser.roles).toHaveLength(0)
 
-      // verify user status is active and he is collaborator of X01
-      await UserController.acceptInvitation({ assessment, cycle, user: invitedUser, userRole })
+      // User accepts invitation with his own email and password
+      const acceptedUser = await UserController.acceptInvitation({
+        assessment,
+        cycle,
+        user: invitedUser,
+        userInvitation,
+      })
 
-      expect(invitedUser.status).toBe(UserStatus.active)
+      // verify user status is active and role is created
+      expect(acceptedUser.status).toBe(UserStatus.active)
+      expect(acceptedUser.roles).toHaveLength(1)
+      expect(acceptedUser.roles[0].countryIso).toBe('X01')
+      expect(acceptedUser.roles[0].role).toBe(RoleName.COLLABORATOR)
     })
 
     it('Invite the user as National Correspondent to a country', async () => {
-      const { user: invitedUser, userRole: invitedUserRole } = await UserController.invite({
+      const { assessment, cycle, user } = testContext
+      const { userInvitation, user: invitedUser } = await UserController.invite({
         assessment,
         countryIso: 'X02',
         cycle,
@@ -57,9 +78,15 @@ export default (): void =>
         lang: Lang.en,
       })
 
-      userRole = invitedUserRole
+      // Save userInvitation in testContext for next test
+      testContext.userInvitation = userInvitation
 
       // invite same userA as National Correspondent to X02
+      // verify user invitation exists and fields are correct
+      expect(userInvitation).toBeDefined()
+      expect(userInvitation.invitedByUserUuid).toBe(user.uuid)
+      expect(userInvitation.role).toBe(RoleName.NATIONAL_CORRESPONDENT)
+      expect(userInvitation.countryIso).toBe('X02')
       // verify user status is active, and he is only collaborator of X01
       expect(invitedUser.status).toBe(UserStatus.active)
 
@@ -70,6 +97,7 @@ export default (): void =>
     })
 
     it('Invite the user as Reviewer to the same country', async () => {
+      const { assessment, cycle, user } = testContext
       // invite same userA as Reviewer to X02
       // verify Controller throws exception since user has a pending invitation for X02 already
       await expect(
@@ -86,11 +114,12 @@ export default (): void =>
     })
 
     it('User accept invitation as National Correspondant', async () => {
-      const { user } = await UserController.findByInvitation({ invitationUuid: userRole.invitationUuid })
+      const { assessment, cycle, userInvitation } = testContext
+      const { user } = await UserController.findByInvitation({ invitationUuid: userInvitation.uuid })
 
       // UserA accept invitation National Correspondant to X02
       // verify user status is active and he is collaborator of X01 and National Correspondant of X02
-      const invitedUser = await UserController.acceptInvitation({ assessment, cycle, user, userRole })
+      const invitedUser = await UserController.acceptInvitation({ assessment, cycle, user, userInvitation })
 
       expect(invitedUser.status).toBe(UserStatus.active)
 
@@ -103,6 +132,7 @@ export default (): void =>
     })
 
     afterAll(async () => {
+      const { user } = testContext
       await UserController.remove({ userToRemove: userMockUnknown, user })
     })
   })
diff --git a/src/test/migrations/index.ts b/src/test/migrations/index.ts
index d9ce8612c3..580c2d5b7d 100644
--- a/src/test/migrations/index.ts
+++ b/src/test/migrations/index.ts
@@ -1,6 +1,8 @@
 import 'tsconfig-paths/register'
 import 'dotenv/config'
 
+import { Promises } from 'utils/promises'
+
 import { VisitCycleLinksQueueFactory } from 'server/controller/cycleData/links/visitCycleLinks/queueFactory'
 import { WorkerFactory as VisitLinksWorkerFactory } from 'server/controller/cycleData/links/visitCycleLinks/workerFactory'
 import { UpdateDependenciesQueueFactory } from 'server/controller/cycleData/updateDependencies/queueFactory'
@@ -55,8 +57,7 @@ const exec = async () => {
   await init()
 
   await client.tx(async (t) => {
-    // eslint-disable-next-line no-restricted-syntax
-    for await (const file of migrationSteps) {
+    await Promises.each(migrationSteps, async (file) => {
       try {
         Logger.info(`Running migration ${file}`)
         // eslint-disable-next-line @typescript-eslint/no-var-requires,global-require,import/no-dynamic-require
@@ -65,7 +66,7 @@ const exec = async () => {
       } catch (e) {
         Logger.error(e)
       }
-    }
+    })
   })
 
   if (!process.argv.includes('--watch')) {
diff --git a/src/test/migrations/steps/20241016104908-step-users_role-invitation-split.ts b/src/test/migrations/steps/20241016104908-step-users_role-invitation-split.ts
new file mode 100644
index 0000000000..4e633af7e4
--- /dev/null
+++ b/src/test/migrations/steps/20241016104908-step-users_role-invitation-split.ts
@@ -0,0 +1,198 @@
+import * as pgPromise from 'pg-promise'
+import { Objects } from 'utils/objects'
+
+import { ActivityLog } from 'meta/assessment'
+import { RoleName, UserRole, UserStatus } from 'meta/user'
+
+import { BaseProtocol, DB } from 'server/db'
+import { AssessmentRepository } from 'server/repository/assessment/assessment'
+import { getUsersInvitationDDL, getUsersRoleDDL } from 'server/repository/public/ddl/getCreatePublicSchemaDDL'
+import { Logger } from 'server/utils/logger'
+
+type DBRole = {
+  userId: number
+  userUuid: string
+  assessmentUuid: string
+  countryIso: string
+  role: string
+  cycleUuid: string
+  permissions: string
+  props: string
+  createdAt: string
+  invitationUuid: string
+}
+
+type DBActivityLogRole = UserRole<RoleName>
+
+type ActivityLogEntry = ActivityLog<{
+  userId: number
+  roles: Array<DBActivityLogRole>
+}>
+
+const client: BaseProtocol = DB
+
+const _handleRole = async (
+  role: DBRole,
+  cycles: Record<string, string>,
+  activityLogsEntries: Record<number, Array<ActivityLogEntry>>
+): Promise<DBRole> => {
+  // Role created by admin
+  if (role.invitationUuid) {
+    if (!role.createdAt) {
+      throw new Error(`Created at is null for invitation role: ${JSON.stringify(role)}`)
+    }
+    return role
+  }
+
+  // Role created through invitation
+  if (role.createdAt) {
+    return role
+  }
+
+  const activityLogEntries = activityLogsEntries[role.userId]
+
+  // It is possible we don't have any matches, e.g. Roles for FRA 2020 added by admin
+  if (!activityLogEntries || activityLogEntries.length === 0) {
+    // eslint-disable-next-line no-param-reassign
+    role.createdAt = cycles[role.cycleUuid]
+    return role
+  }
+
+  // find in which activity log entry the role was first seen
+  const firstActivityLogEntry = activityLogEntries.find((entry) =>
+    entry.target.roles.some((r: DBActivityLogRole) => r.countryIso === role.countryIso)
+  )
+
+  if (!firstActivityLogEntry) {
+    // eslint-disable-next-line no-param-reassign
+    role.createdAt = cycles[role.cycleUuid]
+    return role
+  }
+
+  // eslint-disable-next-line no-param-reassign
+  role.createdAt = firstActivityLogEntry.time
+
+  return role
+}
+
+export default async () => {
+  // ---- 0. Check that the migration is not already ran
+  const queryExists = `select exists (select from information_schema.tables where table_schema = 'public' and table_name = 'users_invitation');`
+  const { exists } = await client.oneOrNone(queryExists)
+  if (exists) {
+    Logger.info('users_invitation table already exists')
+    return
+  }
+
+  const pgp = pgPromise()
+
+  // ---- 1. Add unique index on users (uuid) table
+  await client.query(`create unique index if not exists users_uuid_key on public.users (uuid);`)
+
+  // ---- 1.5 Fix users inconsistencies
+  await client.query(`
+      update users u
+      set status = '${UserStatus.active}'
+      where u.id in
+            (select distinct u.id
+             from users u
+                      left join users_role ur on u.id = ur.user_id
+             where ((ur.invited_at is not null and ur.accepted_at is not null)
+                 or (invited_at is null))
+               and u.status = 'invitationPending'
+               and ur.country_iso is not null)
+  `)
+
+  // ---- 2. Move users_role table to _legacy schema
+  await client.query(`create schema if not exists _legacy;`) // eg running vs partial db
+  await client.query(`alter table public.users_role set schema _legacy;`)
+
+  // ---- 3. Create users_invitation table
+  await client.query(getUsersInvitationDDL())
+
+  // ---- 4. Create new users_role table in public schema
+  await client.query(getUsersRoleDDL())
+
+  // ---- 5. Populate users_invitation table from _legacy
+  await client.query(`
+    insert into public.users_invitation (
+      uuid, user_uuid, assessment_uuid, country_iso, role, cycle_uuid, invited_at, accepted_at, invited_by_user_uuid, props
+    )
+    select 
+      l_ur.invitation_uuid, 
+      (select uuid from public.users where id = l_ur.user_id),
+      (select uuid from public.assessment where id = l_ur.assessment_id),
+      l_ur.country_iso, 
+      l_ur.role, 
+      l_ur.cycle_uuid, 
+      l_ur.invited_at, 
+      l_ur.accepted_at, 
+      l_ur.invited_by_user_uuid,
+      l_ur.props
+    from _legacy.users_role l_ur
+    where l_ur.invitation_uuid is not null;
+  `)
+
+  // ---- 6. Populate new users_role table from _legacy
+  const _roles: Array<DBRole> = await client.map<DBRole>(
+    `
+    select
+      l_ur.user_id as user_id, -- used for activity log matching
+      u.uuid as user_uuid,
+      (select uuid from public.assessment where id = l_ur.assessment_id) as assessment_uuid,
+      l_ur.country_iso,
+      l_ur.role,
+      l_ur.cycle_uuid,
+      l_ur.permissions,
+      l_ur.props,
+      l_ur.accepted_at as created_at,
+      l_ur.invitation_uuid
+    from _legacy.users_role l_ur
+    join public.users u on u.id = l_ur.user_id
+    -- To migrate a role:
+    -- either accepted at exists or invitation uuid doesn't exist
+    -- user must not be pending invitation
+    where (l_ur.accepted_at is not null or l_ur.invitation_uuid is null) and u.status != 'invitationPending'
+  `,
+    [],
+    (row) => Objects.camelize(row)
+  )
+
+  // Utility consts to avoid fetching data multiple times
+  const assessments = await AssessmentRepository.getAll({}, client)
+  // [cycleUuid]: dateCreated
+  const cycleUuidMap: Record<string, string> = Object.fromEntries(
+    assessments.flatMap((assessment) => assessment.cycles.map((cycle) => [cycle.uuid, cycle.props.dateCreated]))
+  )
+  // [activityLogEntry]
+  const _activityLogsEntries = await client.manyOrNone(`
+    select * from public.activity_log where message = 'userRolesUpdate' order by time asc
+    `)
+  // [userId]: [activityLogEntry]
+  const activityLogsEntries: Record<number, Array<ActivityLogEntry>> = _activityLogsEntries.reduce((acc, entry) => {
+    const { userId } = entry.target
+    // eslint-disable-next-line no-param-reassign
+    if (!acc[userId]) acc[userId] = []
+    acc[userId].push(entry)
+    return acc
+  }, {} as Record<number, Array<ActivityLogEntry>>)
+
+  const roles = await Promise.all(_roles.map((role) => _handleRole(role, cycleUuidMap, activityLogsEntries)))
+  const columns = [
+    'user_uuid',
+    'assessment_uuid',
+    'country_iso',
+    'role',
+    'cycle_uuid',
+    'permissions',
+    'props',
+    'created_at',
+    'invitation_uuid',
+  ].map((name) => ({ name, prop: Objects.camelize(name) }))
+
+  const options = { table: { table: 'users_role', schema: 'public' } }
+  const cs = new pgp.helpers.ColumnSet(columns, options)
+
+  const query = pgp.helpers.insert(roles, cs)
+  await client.none(query)
+}
diff --git a/src/test/migrations/steps/20241107082142-step-update-country-summary-invitations.ts b/src/test/migrations/steps/20241107082142-step-update-country-summary-invitations.ts
new file mode 100644
index 0000000000..9ab6e2a2e2
--- /dev/null
+++ b/src/test/migrations/steps/20241107082142-step-update-country-summary-invitations.ts
@@ -0,0 +1,18 @@
+import { AssessmentController } from 'server/controller/assessment'
+import { BaseProtocol } from 'server/db'
+import { CountrySummaryRepository } from 'server/repository/assessmentCycle/countrySummary'
+
+export default async (client: BaseProtocol) => {
+  const assessments = await AssessmentController.getAll({}, client)
+
+  await Promise.all(
+    assessments.map((assessment) =>
+      Promise.all(
+        assessment.cycles.map(async (cycle) => {
+          await CountrySummaryRepository.dropMaterializedView({ assessment, cycle }, client)
+          await CountrySummaryRepository.createMaterializedView({ assessment, cycle }, client)
+        })
+      )
+    )
+  )
+}
diff --git a/src/test/migrations/steps/20241108072821-step-create-view-country-summary.ts b/src/test/migrations/steps/20241108072821-step-create-view-country-summary.ts
new file mode 100644
index 0000000000..f410705916
--- /dev/null
+++ b/src/test/migrations/steps/20241108072821-step-create-view-country-summary.ts
@@ -0,0 +1,24 @@
+import { AssessmentController } from 'server/controller/assessment'
+import { BaseProtocol } from 'server/db'
+import { getCreateOrReplaceViewCountryUserSummary } from 'server/repository/assessment/assessment/getCreateSchemaDDL'
+
+export default async (client: BaseProtocol) => {
+  const assessments = await AssessmentController.getAll({}, client)
+
+  await Promise.all(
+    assessments.map((assessment) =>
+      Promise.all(
+        assessment.cycles.map(async (cycle) => {
+          await client.none(
+            `create index if not exists users_invitation_user_lookup_idx on public.users_invitation(user_uuid, cycle_uuid, assessment_uuid);`
+          )
+          await client.none(
+            `create index if not exists users_role_user_lookup_idx on public.users_role(user_uuid, cycle_uuid, assessment_uuid, role);`
+          )
+
+          await client.query(getCreateOrReplaceViewCountryUserSummary({ assessment, cycle }))
+        })
+      )
+    )
+  )
+}
diff --git a/src/test/migrations/steps/utils/updateODPDependencies.ts b/src/test/migrations/steps/utils/updateODPDependencies.ts
index 1489de313d..4457080672 100644
--- a/src/test/migrations/steps/utils/updateODPDependencies.ts
+++ b/src/test/migrations/steps/utils/updateODPDependencies.ts
@@ -6,7 +6,6 @@ import { NodeUpdate } from 'meta/data'
 
 import { getOriginalDataPointVariables } from 'server/controller/cycleData/originalDataPoint/getOriginalDataPointVariables'
 import { BaseProtocol, DB, Schemas } from 'server/db'
-import { isAtlantisAllowed } from 'server/repository/assessmentCycle/country/isAtlantisAllowed'
 
 import { updateDependencies } from './updateDependencies'
 
@@ -33,15 +32,13 @@ export const updateODPDependencies = async (props: Props, client: BaseProtocol =
   )
 
   originalDataPoints.forEach(({ countryIso, year }) => {
-    if (!countryIso.startsWith('X') || isAtlantisAllowed(assessment, cycle)) {
-      countryNodes[countryIso] = []
-
-      const colName = String(year)
-      const opdNodes = originalDataPointVariables.map<NodeUpdate>(({ tableName, variableName }) => {
-        return { tableName, variableName, colName, value: undefined }
-      })
-      countryNodes[countryIso].push(...opdNodes)
-    }
+    countryNodes[countryIso] = []
+
+    const colName = String(year)
+    const opdNodes = originalDataPointVariables.map<NodeUpdate>(({ tableName, variableName }) => {
+      return { tableName, variableName, colName, value: undefined }
+    })
+    countryNodes[countryIso].push(...opdNodes)
   })
 
   await updateDependencies({
diff --git a/tsconfig.json b/tsconfig.json
index 4b33af8b2a..2b447cf9dc 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,8 +5,9 @@
     "allowJs": true,
     "allowSyntheticDefaultImports": true,
     "baseUrl": "./src",
-    "jsx": "react",
     "isolatedModules": true,
+    "lib": ["ESNext", "DOM", "DOM.Iterable"],
+    "jsx": "react",
     "module": "CommonJS",
     "moduleResolution": "Node",
     "noImplicitAny": true,
@@ -14,15 +15,6 @@
     "noUnusedParameters": true,
     "outDir": "./dist/",
     "resolveJsonModule": true,
-//    "paths": {
-//      "i18n/*": ["./src/i18n/*"],
-//      "client/*": ["./src/client/*"],
-//      "meta/*": ["./src/meta/*"],
-//      "server/*": ["./src/server/*"],
-//      "test/*": ["./src/test/*"],
-//      "utils/*": ["./src/utils/*"]
-//    },
-//    "strict": true,
     "target": "ESNext"
   }
 }
diff --git a/tsconfig.server.json b/tsconfig.server.json
index 5b8955dfee..ebd09d42d7 100644
--- a/tsconfig.server.json
+++ b/tsconfig.server.json
@@ -5,15 +5,15 @@
   "compilerOptions": {
     "allowJs": true,
     "allowSyntheticDefaultImports": true,
-    "skipLibCheck": true,
+    "baseUrl": "./src",
+    "lib": ["ESNext", "DOM"],
     "module": "CommonJS",
     "moduleResolution": "Node",
     "noImplicitAny": true,
     "outDir": "./dist/",
-    "baseUrl": "./src",
-    "rootDir": "./src",
-    "target": "es2020",
     "resolveJsonModule": true,
-    "lib": ["es2020", "esnext", "dom"]
+    "rootDir": "./src",
+    "skipLibCheck": true,
+    "target": "ESNext"
   }
 }
diff --git a/web-resources/img/icons.svg b/web-resources/img/icons.svg
index 70eecce7f6..3618df63e6 100644
--- a/web-resources/img/icons.svg
+++ b/web-resources/img/icons.svg
@@ -394,6 +394,9 @@
     <symbol id="filter" viewBox="0 0 24 24">
         <path d="M20.558 3.273l-7.21 8.524c-0.16 0.189-0.257 0.435-0.257 0.705v7.551l-2.182-1.091v-6.46c0.001-0.248-0.084-0.499-0.257-0.705l-7.21-8.524zM22.908 1.091h-21.818c-0.602 0-1.091 0.489-1.091 1.091 0 0.269 0.097 0.516 0.257 0.705l8.47 10.014v6.735c0 0.424 0.242 0.793 0.603 0.975l4.364 2.182c0.539 0.269 1.195 0.051 1.464-0.488 0.079-0.159 0.116-0.328 0.115-0.488v-8.917l8.47-10.014c0.389-0.46 0.332-1.149-0.129-1.537-0.206-0.175-0.457-0.26-0.705-0.259z"></path>
     </symbol>
+    <symbol id="rotate" viewBox="0 0 32 32">
+        <path d="M27.366 16.867l-4.633-4.633h2.714c-0.025-0.068-0.051-0.135-0.077-0.202-1.61-4.080-5.588-6.966-10.24-6.966-6.077 0-11.005 4.927-11.005 11.005 0 6.078 4.927 11.006 11.005 11.006 4.471 0 8.319-2.666 10.041-6.494 0.017-0.035 0.027-0.075 0.043-0.112l2.951 2.933c-0.019 0.034-0.033 0.073-0.053 0.109-0.005 0.008-0.009 0.016-0.014 0.023-2.604 4.499-7.469 7.525-13.041 7.525-8.314-0.002-15.056-6.744-15.056-15.061s6.742-15.059 15.059-15.059c6.953 0 12.803 4.71 14.536 11.114 0.017 0.059 0.022 0.121 0.036 0.18h2.369l-4.634 4.633z"></path>
+    </symbol>
     <symbol id="home-circle" viewBox="0 0 24 24">
         <path d="M19.07,4.93C17.22,3 14.66,1.96 12,2C9.34,1.96 6.79,3 4.94,4.93C3,6.78 1.96,9.34 2,12C1.96,14.66 3,17.21 4.93,19.06C6.78,21 9.34,22.04 12,22C14.66,22.04 17.21,21 19.06,19.07C21,17.22 22.04,14.66 22,12C22.04,9.34 21,6.78 19.07,4.93M17,12V18H13.5V13H10.5V18H7V12H5L12,5L19.5,12H17Z"></path>
     </symbol>
diff --git a/yarn.lock b/yarn.lock
index feba34d21d..14abd2f40e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13716,10 +13716,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript@^4.6.3:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+typescript@^5.7.2:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
+  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
 
 uberproto@^1.1.0:
   version "1.2.0"