diff --git a/frontend/app/components/Client/Users/components/UserForm/UserForm.tsx b/frontend/app/components/Client/Users/components/UserForm/UserForm.tsx
index 25f35097c..a56e62c83 100644
--- a/frontend/app/components/Client/Users/components/UserForm/UserForm.tsx
+++ b/frontend/app/components/Client/Users/components/UserForm/UserForm.tsx
@@ -94,7 +94,7 @@ function UserForm(props: Props) {
                     </label>
                 </div>
                 
-                { !isEnterprise && (
+                { isEnterprise && (
                     <div className="form-group">
                         <label htmlFor="role">{ 'Role' }</label>
                         <Select
@@ -115,7 +115,7 @@ function UserForm(props: Props) {
                     <div className="flex items-center mr-auto">
                         <Button
                             onClick={ onSave }
-                            disabled={ !user.valid() || isSaving }
+                            disabled={ !user.valid(isEnterprise) || isSaving }
                             loading={ isSaving }
                             primary
                             marginRight
diff --git a/frontend/app/mstore/types/user.ts b/frontend/app/mstore/types/user.ts
index 53ae5dbf0..3c005f0e6 100644
--- a/frontend/app/mstore/types/user.ts
+++ b/frontend/app/mstore/types/user.ts
@@ -95,8 +95,8 @@ export default class User implements IUser {
         }
     }
 
-    valid() {
-        return validateName(this.name, { empty: false }) && validateEmail(this.email) && !!this.roleId;
+    valid(isEnterprise: boolean = false) {
+        return validateName(this.name, { empty: false }) && validateEmail(this.email) && (isEnterprise ? !!this.roleId : true);
     }
 
     exists() {