diff --git a/src/usr/local/www/classes/Form/Section.class.php b/src/usr/local/www/classes/Form/Section.class.php
index 0b93c9b31a..620aabe7fb 100644
--- a/src/usr/local/www/classes/Form/Section.class.php
+++ b/src/usr/local/www/classes/Form/Section.class.php
@@ -75,6 +75,7 @@ class Form_Section extends Form_Element
 		}
 
 		$input->setType("password");
+		$input->setAttribute('autocomplete', 'new-password');
 		$group->add($input);
 		$confirm = clone $input;
 		$confirm->setName($confirm->getName() . "_confirm");
diff --git a/src/usr/local/www/diag_authentication.php b/src/usr/local/www/diag_authentication.php
index 6bd0789441..b652f52cae 100644
--- a/src/usr/local/www/diag_authentication.php
+++ b/src/usr/local/www/diag_authentication.php
@@ -100,7 +100,7 @@ $section->addInput(new Form_Input(
 	'*Username',
 	'text',
 	$pconfig['username'],
-	['placeholder' => 'Username']
+	['placeholder' => 'Username', 'autocomplete' => 'new-password']
 ));
 
 $section->addInput(new Form_Input(
@@ -108,7 +108,7 @@ $section->addInput(new Form_Input(
 	'*Password',
 	'password',
 	$pconfig['password'],
-	['placeholder' => 'Password']
+	['placeholder' => 'Password', 'autocomplete' => 'new-password']
 ));
 
 $form->add($section);
diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php
index 59ad7311e6..3b976286f9 100755
--- a/src/usr/local/www/interfaces.php
+++ b/src/usr/local/www/interfaces.php
@@ -2715,7 +2715,8 @@ $section->addInput(new Form_Input(
 	'ppp_username',
 	'Username',
 	'text',
-	$pconfig['ppp_username']
+	$pconfig['ppp_username'],
+	['autocomplete' => 'new-password']
 ));
 
 $section->addPassword(new Form_Input(
@@ -2782,7 +2783,8 @@ $section->addInput(new Form_Input(
 	'pppoe_username',
 	'*Username',
 	'text',
-	$pconfig['pppoe_username']
+	$pconfig['pppoe_username'],
+	['autocomplete' => 'new-password']
 ));
 
 $section->addPassword(new Form_Input(
@@ -2907,7 +2909,8 @@ $section->addInput(new Form_Input(
 	'pptp_username',
 	'*Username',
 	'text',
-	$pconfig['pptp_username']
+	$pconfig['pptp_username'],
+	['autocomplete' => 'new-password']
 ));
 
 $section->addPassword(new Form_Input(
diff --git a/src/usr/local/www/interfaces_ppps_edit.php b/src/usr/local/www/interfaces_ppps_edit.php
index 6276e115ec..004b9b3df7 100644
--- a/src/usr/local/www/interfaces_ppps_edit.php
+++ b/src/usr/local/www/interfaces_ppps_edit.php
@@ -565,7 +565,8 @@ $section->addInput(new Form_Input(
 	'username',
 	$username_label,
 	'text',
-	$pconfig['username']
+	$pconfig['username'],
+	['autocomplete' => 'new-password']
 ));
 
 $section->addPassword(new Form_Input(
diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php
index a065b54ef9..6200a0fe4c 100644
--- a/src/usr/local/www/services_captiveportal_vouchers.php
+++ b/src/usr/local/www/services_captiveportal_vouchers.php
@@ -540,7 +540,8 @@ $section->addInput(new Form_Input(
 	'vouchersyncusername',
 	'Voucher sync username',
 	'text',
-	$pconfig['vouchersyncusername']
+	$pconfig['vouchersyncusername'],
+	['autocomplete' => 'new-password']
 ))->setHelp('This is the username of the master voucher nodes webConfigurator.');
 
 $section->addPassword(new Form_Input(
diff --git a/src/usr/local/www/services_checkip_edit.php b/src/usr/local/www/services_checkip_edit.php
index 430964bc2c..599bd3d5ee 100644
--- a/src/usr/local/www/services_checkip_edit.php
+++ b/src/usr/local/www/services_checkip_edit.php
@@ -139,7 +139,8 @@ $section->addInput(new Form_Input(
 	'username',
 	'User name',
 	'text',
-	$pconfig['username']
+	$pconfig['username'],
+	['autocomplete' => 'new-password']
 ));
 
 $section->addPassword(new Form_Input(
diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php
index 6290c8b5c5..9b0ed433c8 100644
--- a/src/usr/local/www/services_dyndns_edit.php
+++ b/src/usr/local/www/services_dyndns_edit.php
@@ -366,7 +366,8 @@ $section->addInput(new Form_Input(
 	'username',
 	'Username',
 	'text',
-	$pconfig['username']
+	$pconfig['username'],
+	['autocomplete' => 'new-password']
 ))->setHelp('Username is required for all types except Namecheap, FreeDNS, FreeDNS-v6, DigitalOcean, Linode and Custom Entries.%1$s' .
 			'Azure: Enter your Azure AD application ID%1$s' .
 			'DNS Made Easy: Dynamic DNS ID%1$s' .
diff --git a/src/usr/local/www/services_pppoe_edit.php b/src/usr/local/www/services_pppoe_edit.php
index f40703b437..d36cfefc5d 100644
--- a/src/usr/local/www/services_pppoe_edit.php
+++ b/src/usr/local/www/services_pppoe_edit.php
@@ -495,14 +495,16 @@ if ($usernames != "") {
 			'username' . $counter,
 			null,
 			'text',
-			$user
+			$user,
+			['autocomplete' => 'new-password']
 		))->setHelp($numrows == $counter ? 'Username':null);
 
 		$group->add(new Form_Input(
 			'password' . $counter,
 			null,
 			'password',
-			$passwd
+			$passwd,
+			['autocomplete' => 'new-password']
 		))->setHelp($numrows == $counter ? 'Password':null);
 
 		$group->add(new Form_IpAddress(
diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php
index ea09ceeebf..2c8eef37e8 100644
--- a/src/usr/local/www/system_advanced_misc.php
+++ b/src/usr/local/www/system_advanced_misc.php
@@ -376,7 +376,8 @@ $section->addInput(new Form_Input(
 	'proxyuser',
 	'Proxy Username',
 	'text',
-	$pconfig['proxyuser']
+	$pconfig['proxyuser'],
+	['autocomplete' => 'new-password']
 ))->setHelp('Username for authentication to proxy server. Optional, '.
 	'leave blank to not use authentication.');
 
diff --git a/src/usr/local/www/system_advanced_notifications.php b/src/usr/local/www/system_advanced_notifications.php
index 66111d48e2..a039980475 100644
--- a/src/usr/local/www/system_advanced_notifications.php
+++ b/src/usr/local/www/system_advanced_notifications.php
@@ -279,14 +279,15 @@ $section->addInput(new Form_Input(
 	'Notification E-Mail auth username (optional)',
 	'text',
 	$pconfig['smtpusername'],
-	['autocomplete' => 'off']
+	['autocomplete' => 'new-password']
 ))->setHelp('Enter the e-mail address username for SMTP authentication.');
 
 $section->addPassword(new Form_Input(
 	'smtppassword',
 	'Notification E-Mail auth password',
 	'password',
-	$pconfig['smtppassword']
+	$pconfig['smtppassword'],
+	['autocomplete' => 'new-password']
 ))->setHelp('Enter the e-mail account password for SMTP authentication.');
 
 $section->addInput(new Form_Select(
diff --git a/src/usr/local/www/system_hasync.php b/src/usr/local/www/system_hasync.php
index cc02050d5b..c876f1bdf6 100644
--- a/src/usr/local/www/system_hasync.php
+++ b/src/usr/local/www/system_hasync.php
@@ -163,7 +163,8 @@ $section->addInput(new Form_Input(
 	'username',
 	'Remote System Username',
 	'text',
-	$pconfig['username']
+	$pconfig['username'],
+	['autocomplete' => 'new-password']
 ))->setHelp('Enter the webConfigurator username of the system entered above for synchronizing the configuration.%1$s' .
 			'Do not use the Synchronize Config to IP and username option on backup cluster members!', '<br />');
 
diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php
index 45f417da26..b9846b07ca 100644
--- a/src/usr/local/www/system_usermanager.php
+++ b/src/usr/local/www/system_usermanager.php
@@ -784,7 +784,8 @@ if ($act == "new" || $act == "edit" || $input_errors):
 		'usernamefld',
 		'*Username',
 		'text',
-		$pconfig['usernamefld']
+		$pconfig['usernamefld'],
+		['autocomplete' => 'new-password']
 	));
 
 	if ($ro) {
@@ -808,12 +809,16 @@ if ($act == "new" || $act == "edit" || $input_errors):
 	$group->add(new Form_Input(
 		'passwordfld1',
 		'Password',
-		'password'
+		'password',
+		null,
+		['autocomplete' => 'new-password']
 	));
 	$group->add(new Form_Input(
 		'passwordfld2',
 		'Confirm Password',
-		'password'
+		'password',
+		null,
+		['autocomplete' => 'new-password']
 	));
 
 	$section->add($group);
diff --git a/src/usr/local/www/system_usermanager_passwordmg.php b/src/usr/local/www/system_usermanager_passwordmg.php
index dc3952bf40..fd86be565e 100644
--- a/src/usr/local/www/system_usermanager_passwordmg.php
+++ b/src/usr/local/www/system_usermanager_passwordmg.php
@@ -110,13 +110,17 @@ $section = new Form_Section('Update Password');
 $section->addInput(new Form_Input(
 	'passwordfld1',
 	'*Password',
-	'password'
+	'password',
+	null,
+	['autocomplete' => 'new-password']
 ));
 
 $section->addInput(new Form_Input(
 	'passwordfld2',
 	'*Confirmation',
-	'password'
+	'password',
+	null,
+	['autocomplete' => 'new-password']
 ))->setHelp('Select a new password');
 
 $form->add($section);
diff --git a/src/usr/local/www/vpn_l2tp_users_edit.php b/src/usr/local/www/vpn_l2tp_users_edit.php
index bdb7057ba0..30f1b80433 100644
--- a/src/usr/local/www/vpn_l2tp_users_edit.php
+++ b/src/usr/local/www/vpn_l2tp_users_edit.php
@@ -151,7 +151,8 @@ $section->addInput(new Form_Input(
 	'usernamefld',
 	'*Username',
 	'text',
-	$pconfig['usernamefld']
+	$pconfig['usernamefld'],
+	['autocomplete' => 'new-password']
 ));
 
 $pwd = new Form_Input(
diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php
index 10dbcb72e1..f954b8098c 100644
--- a/src/usr/local/www/vpn_openvpn_client.php
+++ b/src/usr/local/www/vpn_openvpn_client.php
@@ -626,7 +626,8 @@ if ($act=="new" || $act=="edit"):
 		'proxy_user',
 		'Username',
 		'text',
-		$pconfig['proxy_user']
+		$pconfig['proxy_user'],
+		['autocomplete' => 'new-password']
 	));
 
 	$section->addPassword(new Form_Input(
@@ -651,7 +652,8 @@ if ($act=="new" || $act=="edit"):
 		'auth_user',
 		'Username',
 		'text',
-		$pconfig['auth_user']
+		$pconfig['auth_user'],
+		['autocomplete' => 'new-password']
 	))->setHelp('Leave empty when no user name is needed');
 
 	$section->addPassword(new Form_Input(