diff --git a/Neos.Neos/Resources/Private/Partials/Module/Shared/EditAccount.html b/Neos.Neos/Resources/Private/Partials/Module/Shared/EditAccount.html
index 2c3c9c0a45e..2c690c78077 100644
--- a/Neos.Neos/Resources/Private/Partials/Module/Shared/EditAccount.html
+++ b/Neos.Neos/Resources/Private/Partials/Module/Shared/EditAccount.html
@@ -13,14 +13,14 @@
 		<div class="neos-control-group{f:validation.ifHasErrors(for: 'password', then: ' neos-error')}">
 			<label class="neos-control-label" for="password[0]">{neos:backend.translate(id: 'password')}</label>
 			<div class="neos-controls">
-				<f:form.password name="password[0]" id="password[0]" class="neos-span12"/>
+				<f:form.password additionalAttributes="{autocomplete: 'new-password'}" name="password[0]" id="password[0]" class="neos-span12"/>
 			</div>
 		</div>
 
 		<div class="neos-control-group{f:validation.ifHasErrors(for: 'password', then: ' neos-error')}">
 			<label class="neos-control-label" for="password[1]">{neos:backend.translate(source: 'Modules', id: 'users.repeatPassword')}</label>
 			<div class="neos-controls">
-				<f:form.password name="password[1]" id="password[1]" class="neos-span12"/>
+				<f:form.password additionalAttributes="{autocomplete: 'new-password'}" name="password[1]" id="password[1]" class="neos-span12"/>
 				<f:render partial="Module/Shared/FieldValidationResults" arguments="{fieldname: 'password'}"/>
 			</div>
 		</div>
diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/New.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/New.html
index b0dfdf9e473..f7572a1977b 100644
--- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/New.html
+++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/New.html
@@ -14,7 +14,7 @@ <h2>{neos:backend.translate(id: 'user.new.subtitle', value: 'Create a new user',
 				<div class="neos-control-group{f:validation.ifHasErrors(for: 'username', then: ' neos-error')}">
 					<label class="neos-control-label" for="username">{neos:backend.translate(id: 'users.new.userData.username', value: 'Username', source: 'Modules', package: 'Neos.Neos')}</label>
 					<div class="neos-controls">
-						<f:form.textfield name="username" id="username" class="neos-span12" autofocus="true" required="true" />
+						<f:form.textfield name="username" id="username" class="neos-span12" autofocus="true" required="true" additionalAttributes="{autocomplete: 'username'}" />
 						<f:render partial="Module/Shared/FieldValidationResults" arguments="{fieldname: 'username'}"/>
 					</div>
 				</div>
@@ -22,14 +22,14 @@ <h2>{neos:backend.translate(id: 'user.new.subtitle', value: 'Create a new user',
 				<div class="neos-control-group{f:validation.ifHasErrors(for: 'password', then: ' neos-error')}">
 					<label class="neos-control-label" for="password[0]">{neos:backend.translate(id: 'users.new.userData.password', value: 'Password', source: 'Modules', package: 'Neos.Neos')}</label>
 					<div class="neos-controls">
-						<f:form.password name="password[0]" id="password[0]" class="neos-span12" additionalAttributes="{required: true}" />
+						<f:form.password name="password[0]" id="password[0]" class="neos-span12" additionalAttributes="{required: true, autocomplete: 'new-password'}" />
 					</div>
 				</div>
 
 				<div class="neos-control-group{f:validation.ifHasErrors(for: 'password', then: ' neos-error')}">
 					<label class="neos-control-label" for="password[1]">{neos:backend.translate(id: 'users.new.userData.repeatPassword', value: 'Repeat password', source: 'Modules', package: 'Neos.Neos')}</label>
 					<div class="neos-controls">
-						<f:form.password name="password[1]" id="password[1]" class="neos-span12" additionalAttributes="{required: true}" />
+						<f:form.password name="password[1]" id="password[1]" class="neos-span12" additionalAttributes="{required: true, autocomplete: 'new-password'}" />
 						<f:render partial="Module/Shared/FieldValidationResults" arguments="{fieldname: 'password'}"/>
 					</div>
 				</div>