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/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/TablePaginated/TablePaginated.tsx b/src/client/components/TablePaginated/TablePaginated.tsx
index 1967123cd7..c82c997267 100644
--- a/src/client/components/TablePaginated/TablePaginated.tsx
+++ b/src/client/components/TablePaginated/TablePaginated.tsx
@@ -101,7 +101,7 @@ TablePaginated.defaultProps = {
   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/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Actions.scss b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Actions.scss
index 4bc5ff8134..801e9717d3 100644
--- a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Actions.scss
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Actions.scss
@@ -9,8 +9,4 @@
     width: 1px;
     height: 16px;
   }
-
-  .btn-message__count {
-    padding-top: 10px;
-  }
 }
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
index 3347c9a494..fcb0f06e06 100644
--- a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Edit/Edit.tsx
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/Edit/Edit.tsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom'
 
 import { CountryIso } from 'meta/area'
 import { Routes } from 'meta/routes'
-import { Users } from 'meta/user'
+import { Authorizer } from 'meta/user'
 import { CountryUserSummaries } from 'meta/user/countryUserSummaries'
 
 import { useCycle } from 'client/store/assessment'
@@ -27,9 +27,9 @@ const Edit: React.FC<Props> = (props: Props) => {
   const currentUser = useUser()
   const cycle = useCycle()
 
-  const currentUserIsReviewer = Users.isReviewer(currentUser, countryIso, cycle)
-  const label = t(currentUserIsReviewer ? 'common.view' : 'userManagement.edit')
-  const iconName = currentUserIsReviewer ? 'icon-eye' : 'pencil'
+  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)) {
diff --git a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/useActions.ts b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/useActions.ts
index 94f602879e..150ac390ce 100644
--- a/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/useActions.ts
+++ b/src/client/pages/CountryHome/Collaborators/UserList/UserCard/Actions/useActions.ts
@@ -1,9 +1,10 @@
-import React from 'react'
+import React, { useMemo } from 'react'
 
 import { CountryIso } from 'meta/area'
-import { UserInvitations, Users } from 'meta/user'
+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'
@@ -24,6 +25,7 @@ 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)
@@ -33,32 +35,47 @@ export const useActions = (props: Props): Array<ActionType> => {
   const isInvitation = CountryUserSummaries.isInvitation(user, countryIso)
   const expired = invitation && UserInvitations.isExpired(invitation)
 
-  // List of actions available to the user
-  const actions: Array<ActionType> = []
+  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 })
+    // 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 })
     }
-    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 (!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 (canSendOrReceiveMessage && !isSelf) {
+        actions.push({ name: 'message', Component: Message })
+      }
 
-    if (Users.isAdministrator(currentUser) || isSelf) {
-      actions.push({ name: 'edit', Component: Edit })
+      if (
+        Authorizer.canEditUser({ countryIso, cycle, user: currentUser, target: user }) ||
+        Users.isReviewer(currentUser, countryIso, cycle)
+      ) {
+        actions.push({ name: 'edit', Component: Edit })
+      }
     }
-  }
-  return actions
+    return actions
+  }, [
+    canCurrentUserEditActivities,
+    canCurrentUserViewActivities,
+    canTargetUserViewActivities,
+    countryIso,
+    currentUser,
+    cycle,
+    expired,
+    isInvitation,
+    user,
+  ])
 }
diff --git a/src/client/pages/CountryHome/CountryHeader/CountryHeader.tsx b/src/client/pages/CountryHome/CountryHeader/CountryHeader.tsx
index 1efdfd4561..b3637e95bf 100644
--- a/src/client/pages/CountryHome/CountryHeader/CountryHeader.tsx
+++ b/src/client/pages/CountryHome/CountryHeader/CountryHeader.tsx
@@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next'
 import { NavLink } from 'react-router-dom'
 
 import classNames from 'classnames'
-import { Objects } from 'utils/objects'
 
 import { Areas } from 'meta/area'
 import { MessageTopicType, Topics } from 'meta/messageCenter'
@@ -42,7 +41,7 @@ const CountryHeader: React.FC<Props> = (props) => {
   )
 
   const withTabs = useMemo<boolean>(
-    () => !Objects.isEmpty(sections) && Areas.isISOCountry(countryIso),
+    () => Areas.isISOCountry(countryIso) && sections?.length > 1,
     [countryIso, sections]
   )
 
diff --git a/src/client/pages/CountryHome/FraHome/hooks/useSections.tsx b/src/client/pages/CountryHome/FraHome/hooks/useSections.tsx
index 56a720b859..04762f9eb9 100644
--- a/src/client/pages/CountryHome/FraHome/hooks/useSections.tsx
+++ b/src/client/pages/CountryHome/FraHome/hooks/useSections.tsx
@@ -3,6 +3,7 @@ import { useMemo } from 'react'
 import { Areas } from 'meta/area'
 import { Cycles } from 'meta/assessment'
 import { SectionNames } from 'meta/routes'
+import { Users } from 'meta/user'
 
 import { useCycle } from 'client/store/assessment'
 import { useCanSeeUserActivities, useUser } from 'client/store/user'
@@ -26,12 +27,13 @@ export const useSections = (): 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 && isCountry) {
+    if (hasRoleInCountry) {
       sections.push({ name: SectionNames.Country.Home.repository, component: Repository })
     }
 
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/landing.json b/src/i18n/resources/en/landing.json
index e6866e5e1c..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",
-    "collaborators": "$t(common.collaborators)",
+    "userManagement": "Manage Collaborators",
     "versioning": "Versioning"
   },
   "users": {
diff --git a/src/i18n/resources/en/other.json b/src/i18n/resources/en/other.json
index a648b374b6..3c8a9a2ea4 100644
--- a/src/i18n/resources/en/other.json
+++ b/src/i18n/resources/en/other.json
@@ -643,28 +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",
-      "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": ""
-    }
-  },
   "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/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/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)
     ),
   ])
 }