diff --git a/packages/core/admin/admin/src/pages/Users/ListPage/ModalForm/index.js b/packages/core/admin/admin/src/pages/Users/ListPage/ModalForm/index.js
new file mode 100644
index 0000000000..ca069c6e6c
--- /dev/null
+++ b/packages/core/admin/admin/src/pages/Users/ListPage/ModalForm/index.js
@@ -0,0 +1,108 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+import {
+  Stack,
+  Grid,
+  GridItem,
+  ModalLayout,
+  ModalHeader,
+  ModalFooter,
+  ModalBody,
+  Button,
+  Breadcrumbs,
+  Crumb,
+  Text,
+  Box,
+  H2,
+} from '@strapi/parts';
+import { Formik } from 'formik';
+import { Form } from '@strapi/helper-plugin';
+import schema from './utils/schema';
+import stepper from './utils/stepper';
+
+const ModalForm = ({ onToggle }) => {
+  const [currentStep, setStep] = useState('create');
+  const { formatMessage } = useIntl();
+  const headerTitle = formatMessage({
+    id: 'Settings.permissions.users.create',
+    defaultMessage: 'Create new user',
+  });
+
+  const goNext = () => {
+    if (next) {
+      setStep(next);
+    } else {
+      onToggle();
+    }
+  };
+
+  const { buttonSubmitLabel, isDisabled, next } = stepper[currentStep];
+
+  return (
+    <ModalLayout onClose={onToggle} labelledBy="title">
+      <ModalHeader>
+        <Breadcrumbs label={headerTitle}>
+          <Crumb>{headerTitle}</Crumb>
+        </Breadcrumbs>
+      </ModalHeader>
+      <Formik
+        initialValues={{ firstname: '', lastname: '', email: '', roles: [] }}
+        onSubmit={() => {}}
+        validationSchema={schema}
+        validateOnChange={false}
+      >
+        {({ errors, handleChange, values }) => {
+          return (
+            <Form>
+              <ModalBody>
+                <Stack size={6}>
+                  <Box>
+                    <H2>
+                      {formatMessage({
+                        id: 'app.components.Users.ModalCreateBody.block-title.details',
+                        defaultMessage: 'Details',
+                      })}
+                    </H2>
+                  </Box>
+                  <Box>
+                    <H2>
+                      {formatMessage({
+                        id: 'app.components.Users.ModalCreateBody.block-title.login',
+                        defaultMessage: 'Login settings',
+                      })}
+                    </H2>
+                  </Box>
+                </Stack>
+                <input type="text" value={values.firstname} name="firstname" />
+              </ModalBody>
+              <ModalFooter
+                startActions={
+                  <Button variant="tertiary" onClick={onToggle} type="button">
+                    {formatMessage({
+                      id: 'app.components.Button.cancel',
+                      defaultMessage: 'Cancel',
+                    })}
+                  </Button>
+                }
+                endActions={
+                  <>
+                    <Button type="submit" loading={false}>
+                      {formatMessage(buttonSubmitLabel)}
+                    </Button>
+                  </>
+                }
+              />
+            </Form>
+          );
+        }}
+      </Formik>
+    </ModalLayout>
+  );
+};
+
+ModalForm.propTypes = {
+  onToggle: PropTypes.func.isRequired,
+};
+
+export default ModalForm;
diff --git a/packages/core/admin/admin/src/pages/Users/ListPage/ModalForm/utils/schema.js b/packages/core/admin/admin/src/pages/Users/ListPage/ModalForm/utils/schema.js
new file mode 100644
index 0000000000..98019e27b8
--- /dev/null
+++ b/packages/core/admin/admin/src/pages/Users/ListPage/ModalForm/utils/schema.js
@@ -0,0 +1,17 @@
+import * as yup from 'yup';
+import { translatedErrors } from '@strapi/helper-plugin';
+
+const schema = yup.object().shape({
+  firstname: yup.string().required(translatedErrors.required),
+  lastname: yup.string().required(translatedErrors.required),
+  email: yup
+    .string()
+    .email(translatedErrors.email)
+    .required(translatedErrors.required),
+  roles: yup
+    .array()
+    .min(1, translatedErrors.min)
+    .required(translatedErrors.required),
+});
+
+export default schema;
diff --git a/packages/core/admin/admin/src/pages/Users/ListPage/ModalForm/utils/stepper.js b/packages/core/admin/admin/src/pages/Users/ListPage/ModalForm/utils/stepper.js
new file mode 100644
index 0000000000..d265afc36c
--- /dev/null
+++ b/packages/core/admin/admin/src/pages/Users/ListPage/ModalForm/utils/stepper.js
@@ -0,0 +1,21 @@
+// import { ModalCreateBody } fro../../../../../components/Usersers';
+
+const stepper = {
+  create: {
+    buttonSubmitLabel: {
+      id: 'app.containers.Users.ModalForm.footer.button-success',
+      defaultMessage: 'Create user',
+    },
+    // Component: ModalCreateBody,
+    isDisabled: false,
+    next: 'magic-link',
+  },
+  'magic-link': {
+    buttonSubmitLabel: { id: 'form.button.finish', defaultMessage: 'Finish' },
+    // Component: ModalCreateBody,
+    isDisabled: true,
+    next: null,
+  },
+};
+
+export default stepper;
diff --git a/packages/core/admin/admin/src/pages/Users/ListPage/ModalForm.js b/packages/core/admin/admin/src/pages/Users/ListPage/ModalForme.js
similarity index 98%
rename from packages/core/admin/admin/src/pages/Users/ListPage/ModalForm.js
rename to packages/core/admin/admin/src/pages/Users/ListPage/ModalForme.js
index 0a4fa38fa3..00ad52d7b0 100644
--- a/packages/core/admin/admin/src/pages/Users/ListPage/ModalForm.js
+++ b/packages/core/admin/admin/src/pages/Users/ListPage/ModalForme.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Button } from '@buffetjs/core';
 import { useIntl } from 'react-intl';
 import { Modal, ModalFooter, ModalHeader } from '@strapi/helper-plugin';
-import stepper from './stepper';
+import stepper from './ModalForm/utils/stepper';
 
 const ModalForm = ({ isOpen, onClosed, onToggle }) => {
   const [currentStep, setStep] = useState('create');
diff --git a/packages/core/admin/admin/src/pages/Users/ListPage/index.js b/packages/core/admin/admin/src/pages/Users/ListPage/index.js
index 29e6801671..b67737b30e 100644
--- a/packages/core/admin/admin/src/pages/Users/ListPage/index.js
+++ b/packages/core/admin/admin/src/pages/Users/ListPage/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import {
   CustomContentLayout,
   useRBAC,
@@ -15,6 +15,7 @@ import get from 'lodash/get';
 import adminPermissions from '../../../permissions';
 import DynamicTable from './DynamicTable';
 import Filters from './Filters';
+import ModalForm from './ModalForm';
 import Search from './Search';
 import PaginationFooter from './PaginationFooter';
 import { deleteData, fetchData } from './utils/api';
@@ -22,6 +23,7 @@ import displayedFilters from './utils/displayedFilters';
 import tableHeaders from './utils/tableHeaders';
 
 const ListPage = () => {
+  const [isModalOpened, setIsModalOpen] = useState(true);
   const {
     allowedActions: { canCreate, canDelete, canRead, canUpdate },
   } = useRBAC(adminPermissions.settings.users);
@@ -29,6 +31,7 @@ const ListPage = () => {
   const toggleNotification = useNotification();
   const { formatMessage } = useIntl();
   const { search } = useLocation();
+  useFocusWhenNavigate();
 
   const { status, data, isFetching } = useQuery(['users', search], () => fetchData(search), {
     enabled: canRead,
@@ -43,7 +46,9 @@ const ListPage = () => {
     },
   });
 
-  useFocusWhenNavigate();
+  const handleToggle = () => {
+    setIsModalOpen(prev => !prev);
+  };
 
   const total = get(data, 'pagination.total', 0);
 
@@ -68,11 +73,7 @@ const ListPage = () => {
     (status !== 'success' && status !== 'error') || (status === 'success' && isFetching);
 
   const createAction = canCreate ? (
-    <Button
-      data-testid="create-user-button"
-      onClick={() => 'handleToggleModalForCreatingRole'}
-      startIcon={<Mail />}
-    >
+    <Button data-testid="create-user-button" onClick={handleToggle} startIcon={<Mail />}>
       {formatMessage({
         id: 'Settings.permissions.users.create',
         defaultMessage: 'Create new user',
@@ -129,6 +130,7 @@ const ListPage = () => {
           </>
         )}
       </CustomContentLayout>
+      {isModalOpened && <ModalForm onToggle={handleToggle} />}
     </Main>
   );
 
diff --git a/packages/core/admin/admin/src/pages/Users/ListPage/stepper.js b/packages/core/admin/admin/src/pages/Users/ListPage/stepper.js
deleted file mode 100644
index c9092f92d6..0000000000
--- a/packages/core/admin/admin/src/pages/Users/ListPage/stepper.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { ModalCreateBody } from '../../../components/Users';
-
-const stepper = {
-  create: {
-    buttonSubmitLabel: 'app.containers.Users.ModalForm.footer.button-success',
-    Component: ModalCreateBody,
-    isDisabled: false,
-    next: 'magic-link',
-  },
-  'magic-link': {
-    buttonSubmitLabel: 'form.button.continue',
-    Component: ModalCreateBody,
-    isDisabled: true,
-    next: null,
-  },
-};
-
-export default stepper;
diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json
index 1d359d792c..e54e439a9e 100644
--- a/packages/core/admin/admin/src/translations/en.json
+++ b/packages/core/admin/admin/src/translations/en.json
@@ -110,7 +110,6 @@
   "Settings.permissions.conditions.when": "When",
   "Settings.permissions.menu.link.roles.label": "Roles",
   "Settings.permissions.menu.link.users.label": "Users",
-  "Settings.permissions.users.add-new": "Add new user",
   "Settings.permissions.users.create": "Create new user",
   "Settings.permissions.users.form.email": "Email",
   "Settings.permissions.users.form.firstname": "First name",
diff --git a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/index.js b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js
similarity index 96%
rename from packages/plugins/users-permissions/admin/src/components/FormModal/Input/index.js
rename to packages/core/helper-plugin/lib/src/components/GenericInput/index.js
index 1791980d60..d62cb7fe4b 100644
--- a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/index.js
+++ b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js
@@ -10,7 +10,7 @@ import { ToggleInput } from '@strapi/parts/ToggleInput';
 import { TextInput } from '@strapi/parts/TextInput';
 import PropTypes from 'prop-types';
 
-const Input = ({
+const GenericInput = ({
   description,
   disabled,
   intlLabel,
@@ -85,7 +85,7 @@ const Input = ({
   );
 };
 
-Input.defaultProps = {
+GenericInput.defaultProps = {
   description: null,
   disabled: false,
   error: '',
@@ -93,7 +93,7 @@ Input.defaultProps = {
   value: '',
 };
 
-Input.propTypes = {
+GenericInput.propTypes = {
   description: PropTypes.shape({
     id: PropTypes.string.isRequired,
     defaultMessage: PropTypes.string.isRequired,
@@ -118,4 +118,4 @@ Input.propTypes = {
   value: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
 };
 
-export default Input;
+export default GenericInput;
diff --git a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js b/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js
similarity index 98%
rename from packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js
rename to packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js
index 7d54539097..7a4abbb63c 100644
--- a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js
+++ b/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js
@@ -1,6 +1,6 @@
 /**
  *
- * Tests for Input
+ * Tests for GenericInput
  *
  */
 
@@ -29,7 +29,7 @@ const makeApp = (name, type, value) => (
   </IntlProvider>
 );
 
-describe('<Input />', () => {
+describe('<GenericInput />', () => {
   it('renders and matches the snapshot', () => {
     const {
       container: { firstChild },
diff --git a/packages/core/helper-plugin/lib/src/index.js b/packages/core/helper-plugin/lib/src/index.js
index 16a6ab5941..54684471b3 100644
--- a/packages/core/helper-plugin/lib/src/index.js
+++ b/packages/core/helper-plugin/lib/src/index.js
@@ -175,6 +175,7 @@ export { default as CheckPermissions } from './components/CheckPermissions';
 export { default as CustomContentLayout } from './components/CustomContentLayout';
 export { default as EmptyStateLayout } from './components/EmptyStateLayout';
 export { default as EmptyBodyTable } from './components/EmptyBodyTable';
+export { default as GenericInput } from './components/GenericInput';
 export * from './components/InjectionZone';
 export { default as LoadingIndicatorPage } from './components/LoadingIndicatorPage';
 export { default as SettingsPageTitle } from './components/SettingsPageTitle';
diff --git a/packages/plugins/users-permissions/admin/src/components/FormModal/index.js b/packages/plugins/users-permissions/admin/src/components/FormModal/index.js
index 82a866b014..2b1ff60b5c 100644
--- a/packages/plugins/users-permissions/admin/src/components/FormModal/index.js
+++ b/packages/plugins/users-permissions/admin/src/components/FormModal/index.js
@@ -20,8 +20,7 @@ import {
 } from '@strapi/parts';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
-import { Form } from '@strapi/helper-plugin';
-import Input from './Input';
+import { Form, GenericInput } from '@strapi/helper-plugin';
 
 const FormModal = ({
   headerBreadcrumbs,
@@ -64,7 +63,7 @@ const FormModal = ({
                       return row.map(input => {
                         return (
                           <GridItem key={input.name} col={input.size} xs={12}>
-                            <Input
+                            <GenericInput
                               {...input}
                               error={errors[input.name]}
                               onChange={handleChange}