diff --git a/client/views/admin/users/EditUser.js b/client/views/admin/users/EditUser.js
index 13dae16ae0c24..5d97ec5ad51c2 100644
--- a/client/views/admin/users/EditUser.js
+++ b/client/views/admin/users/EditUser.js
@@ -109,11 +109,11 @@ export function EditUser({ data, roles, ...props }) {
 			<Box display='flex' flexDirection='row' justifyContent='space-between' w='full'>
 				<Margins inlineEnd='x4'>
 					<Button flexGrow={1} type='reset' disabled={!canSaveOrReset} onClick={reset}>{t('Reset')}</Button>
-					<Button mie='none' flexGrow={1} disabled={!canSaveOrReset} onClick={handleSave}>{t('Save')}</Button>
+					<Button mie='none' flexGrow={1} disabled={!canSaveOrReset || values.email.length === 0} onClick={handleSave}>{t('Save')}</Button>
 				</Margins>
 			</Box>
 		</Field.Row>
-	</Field>, [handleSave, canSaveOrReset, reset, t]);
+	</Field>, [handleSave, canSaveOrReset, reset, t, values]);
 
 	return <UserForm formValues={values} formHandlers={handlers} availableRoles={availableRoles} prepend={prepend} append={append} {...props}/>;
 }