diff --git a/packages/core/admin/admin/src/components/Users/RoleSettingsModalSection/RolesSelectComponent.js b/packages/core/admin/admin/src/components/Users/RoleSettingsModalSection/RolesSelectComponent.js
index d63a9a25d7..50e0357b00 100644
--- a/packages/core/admin/admin/src/components/Users/RoleSettingsModalSection/RolesSelectComponent.js
+++ b/packages/core/admin/admin/src/components/Users/RoleSettingsModalSection/RolesSelectComponent.js
@@ -46,7 +46,7 @@ RolesSelectComponent.defaultProps = {
 RolesSelectComponent.propTypes = {
   isDisabled: PropTypes.bool.isRequired,
   value: PropTypes.array,
-  error: PropTypes.string,
+  error: PropTypes.object,
   onChange: PropTypes.func.isRequired,
 };
 
diff --git a/packages/core/admin/admin/src/components/Users/RoleSettingsModalSection/index.js b/packages/core/admin/admin/src/components/Users/RoleSettingsModalSection/index.js
index c5a3410232..91ea0ef678 100644
--- a/packages/core/admin/admin/src/components/Users/RoleSettingsModalSection/index.js
+++ b/packages/core/admin/admin/src/components/Users/RoleSettingsModalSection/index.js
@@ -67,7 +67,7 @@ RoleSettingsModalSection.propTypes = {
     useSSORegistration: PropTypes.bool,
   }).isRequired,
   formErrors: PropTypes.shape({
-    roles: PropTypes.array,
+    roles: PropTypes.object,
     useSSORegistration: PropTypes.bool,
   }),
   onChange: PropTypes.func.isRequired,
diff --git a/packages/core/admin/admin/src/pages/ProfilePage/utils/schema.js b/packages/core/admin/admin/src/pages/ProfilePage/utils/schema.js
index 7b61bdada4..24d04f60b9 100644
--- a/packages/core/admin/admin/src/pages/ProfilePage/utils/schema.js
+++ b/packages/core/admin/admin/src/pages/ProfilePage/utils/schema.js
@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-import { profileValidation } from '../../../validations/users';
+import { profileValidation } from '../../Users/utils/validations/users';
 
 const schema = yup.object().shape(profileValidation);
 
diff --git a/packages/core/admin/admin/src/pages/Users/EditPage/index.js b/packages/core/admin/admin/src/pages/Users/EditPage/index.js
index b0629608ab..dcd6f5f75e 100644
--- a/packages/core/admin/admin/src/pages/Users/EditPage/index.js
+++ b/packages/core/admin/admin/src/pages/Users/EditPage/index.js
@@ -12,7 +12,7 @@ import FormBloc from '../../../components/FormBloc';
 import { Header } from '../../../components/Settings';
 import { MagicLink, SelectRoles } from '../../../components/Users';
 import { useSettingsForm } from '../../../hooks';
-import { editValidation } from '../../../validations/users';
+import { editValidation } from '../utils/validations/users';
 import form from './utils/form';
 
 const EditPage = ({ canUpdate }) => {
diff --git a/packages/core/admin/admin/src/validations/users/edit.js b/packages/core/admin/admin/src/pages/Users/utils/validations/users/edit.js
similarity index 100%
rename from packages/core/admin/admin/src/validations/users/edit.js
rename to packages/core/admin/admin/src/pages/Users/utils/validations/users/edit.js
diff --git a/packages/core/admin/admin/src/validations/users/index.js b/packages/core/admin/admin/src/pages/Users/utils/validations/users/index.js
similarity index 100%
rename from packages/core/admin/admin/src/validations/users/index.js
rename to packages/core/admin/admin/src/pages/Users/utils/validations/users/index.js
diff --git a/packages/core/admin/admin/src/validations/users/profile.js b/packages/core/admin/admin/src/pages/Users/utils/validations/users/profile.js
similarity index 100%
rename from packages/core/admin/admin/src/validations/users/profile.js
rename to packages/core/admin/admin/src/pages/Users/utils/validations/users/profile.js
diff --git a/packages/core/admin/admin/src/validations/users/roles.js b/packages/core/admin/admin/src/pages/Users/utils/validations/users/roles.js
similarity index 100%
rename from packages/core/admin/admin/src/validations/users/roles.js
rename to packages/core/admin/admin/src/pages/Users/utils/validations/users/roles.js