diff --git a/frontend/src/locale/en.json b/frontend/src/locale/en.json
index 546fa5177..dfebb1360 100644
--- a/frontend/src/locale/en.json
+++ b/frontend/src/locale/en.json
@@ -507,6 +507,7 @@
     "user_name": "User name",
     "user_name_description": "Only latin characters, dashes, underscores, and digits",
     "global_role_description": "Whether the user is an administrator or not",
+    "email_description": "Enter user email",
     "token": "Token",
     "token_description": "Specify use your personal access token",
     "global_role": "Global role",
@@ -530,7 +531,8 @@
       "refresh_token_confirm_message": "Are you sure you want to rotate token?",
       "refresh_token_button_label": "Rotate",
       "validation": {
-        "user_name_format": "Only letters, numbers, - or _"
+        "user_name_format": "Only letters, numbers, - or _",
+        "email_format": "Incorrect email"
       }
     },
 
diff --git a/frontend/src/pages/User/Details/Settings/index.tsx b/frontend/src/pages/User/Details/Settings/index.tsx
index 52d98aa72..0c57ef3e8 100644
--- a/frontend/src/pages/User/Details/Settings/index.tsx
+++ b/frontend/src/pages/User/Details/Settings/index.tsx
@@ -80,12 +80,10 @@ export const Settings: React.FC = () => {
                             {/*    <div>{data.user_name}</div>*/}
                             {/*</div>*/}
 
-                            {process.env.UI_VERSION !== 'enterprise' && (
-                                <div>
-                                    <Box variant="awsui-key-label">{t('users.email')}</Box>
-                                    <div>{data.email ?? '-'}</div>
-                                </div>
-                            )}
+                            <div>
+                                <Box variant="awsui-key-label">{t('users.email')}</Box>
+                                <div>{data.email ?? '-'}</div>
+                            </div>
 
                             <PermissionGuard allowedGlobalRoles={[GlobalUserRole.ADMIN]}>
                                 <div>
diff --git a/frontend/src/pages/User/Edit/index.tsx b/frontend/src/pages/User/Edit/index.tsx
index 4671a861f..b0a6993fb 100644
--- a/frontend/src/pages/User/Edit/index.tsx
+++ b/frontend/src/pages/User/Edit/index.tsx
@@ -84,7 +84,7 @@ export const UserEdit: React.FC = () => {
     const onSubmitHandler = async (userData: Partial<IUser>) => {
         try {
             const data = await updateUser({
-                ...pick(userData, ['global_role']),
+                ...pick(userData, ['global_role', 'email']),
                 username: paramUserName,
             }).unwrap();
 
diff --git a/frontend/src/pages/User/Form/index.tsx b/frontend/src/pages/User/Form/index.tsx
index 4f8934372..aac5d6aaa 100644
--- a/frontend/src/pages/User/Form/index.tsx
+++ b/frontend/src/pages/User/Form/index.tsx
@@ -102,6 +102,20 @@ export const UserForm: React.FC<Props> = ({
                                 />
                             )}
 
+                            <FormInput
+                                label={t('users.email')}
+                                description={t('users.email_description')}
+                                control={control}
+                                name="email"
+                                disabled={loading}
+                                rules={{
+                                    pattern: {
+                                        value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
+                                        message: t('users.edit.validation.email_format'),
+                                    },
+                                }}
+                            />
+
                             <FormSelect
                                 label={t('users.global_role')}
                                 description={t('users.global_role_description')}
diff --git a/frontend/src/pages/User/List/index.tsx b/frontend/src/pages/User/List/index.tsx
index 1c216307c..633d1daf4 100644
--- a/frontend/src/pages/User/List/index.tsx
+++ b/frontend/src/pages/User/List/index.tsx
@@ -56,7 +56,7 @@ export const UserList: React.FC = () => {
                 <NavigateLink href={ROUTES.USER.DETAILS.FORMAT(item.username)}>{item.username}</NavigateLink>
             ),
         },
-        process.env.UI_VERSION === 'sky' && {
+        {
             id: 'email',
             header: t('users.email'),
             cell: (item: IUser) => item.email ?? '-',