diff --git a/client/admin/users/UserForm.js b/client/admin/users/UserForm.js
index 4c02a6c6e8784..3157e20af55b0 100644
--- a/client/admin/users/UserForm.js
+++ b/client/admin/users/UserForm.js
@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo } from 'react';
-import { Field, TextInput, TextAreaInput, MultiSelectFiltered, Box, ToggleSwitch, Icon, Divider } from '@rocket.chat/fuselage';
+import { Field, TextInput, TextAreaInput, PasswordInput, MultiSelectFiltered, Box, ToggleSwitch, Icon, Divider } from '@rocket.chat/fuselage';
 
 import { useTranslation } from '../../contexts/TranslationContext';
 import { isEmail } from '../../../app/utils/lib/isEmail.js';
@@ -89,7 +89,7 @@ export default function UserForm({ formValues, formHandlers, availableRoles, app
 		{useMemo(() => <Field>
 			<Field.Label>{t('Password')}</Field.Label>
 			<Field.Row>
-				<TextInput flexGrow={1} value={password} onChange={handlePassword} addon={<Icon name='key' size='x20'/>}/>
+				<PasswordInput autoComplete='off' flexGrow={1} value={password} onChange={handlePassword} addon={<Icon name='key' size='x20'/>}/>
 			</Field.Row>
 		</Field>, [t, password, handlePassword])}
 		{useMemo(() => <Field>
diff --git a/client/admin/users/UserInfoActions.js b/client/admin/users/UserInfoActions.js
index ec7e8b5a85557..0070586a3ee21 100644
--- a/client/admin/users/UserInfoActions.js
+++ b/client/admin/users/UserInfoActions.js
@@ -207,7 +207,7 @@ export const UserInfoActions = ({ username, _id, isActive, isAdmin, onChange })
 
 	const actions = useMemo(() => [...actionsDefinition.map(([key, { label, icon, action }]) => <UserInfo.Action key={key} title={label} label={label} onClick={action} icon={icon}/>), menu].filter(Boolean), [actionsDefinition, menu]);
 
-	return <ButtonGroup flexGrow={1} justifyContent='center'>
+	return <ButtonGroup flexGrow={0} justifyContent='center'>
 		{actions}
 	</ButtonGroup>;
 };
diff --git a/client/components/basic/avatar/UserAvatarEditor.js b/client/components/basic/avatar/UserAvatarEditor.js
index fcc90a7bcb071..256181d0b6ab7 100644
--- a/client/components/basic/avatar/UserAvatarEditor.js
+++ b/client/components/basic/avatar/UserAvatarEditor.js
@@ -52,7 +52,7 @@ export function UserAvatarEditor({ username, setAvatarObj, suggestions, disabled
 			<Box display='flex' flexDirection='column' flexGrow='1' justifyContent='space-between' mis='x4'>
 				<Box display='flex' flexDirection='row' mbs='none'>
 					<Margins inline='x4'>
-						<Button square mis='none' onClick={clickReset} disabled={disabled}><Avatar size='x36' url={`/avatar/%40${ username }`} mie='x4'/></Button>
+						<Button square mis='none' onClick={clickReset} disabled={disabled} mie='x4'><Avatar size='x36' url={`/avatar/%40${ username }`}/></Button>
 						<Button square onClick={clickUpload} disabled={disabled}><Icon name='upload' size='x20'/></Button>
 						<Button square mie='none' onClick={clickUrl} disabled={disabled}><Icon name='permalink' size='x20'/></Button>
 						{suggestions && <UserAvatarSuggestions suggestions={suggestions} setAvatarObj={setAvatarObj} setNewAvatarSource={setNewAvatarSource} disabled={disabled}/>}