diff --git a/lib/classes/output/class.htmlform.php b/lib/classes/output/class.htmlform.php
index 6b7514ca..51468bff 100644
--- a/lib/classes/output/class.htmlform.php
+++ b/lib/classes/output/class.htmlform.php
@@ -149,6 +149,9 @@ class htmlform
 		if(isset($data['size'])) {
 			$extras .= ' size="'.$data['size'].'"';
 		}
+		if(isset($data['autocomplete'])) {
+                        $extras .= ' autocomplete="'.$data['autocomplete'].'"';
+                }
 
 		// add support to save reloaded forms
 		if (isset($data['value'])) {
diff --git a/lib/formfields/admin/admin/formfield.admin_add.php b/lib/formfields/admin/admin/formfield.admin_add.php
index 60a5741c..d0b7dc97 100644
--- a/lib/formfields/admin/admin/formfield.admin_add.php
+++ b/lib/formfields/admin/admin/formfield.admin_add.php
@@ -32,7 +32,8 @@ return array(
 					'admin_password' => array(
 						'label' => $lng['login']['password'],
 						'type' => 'password',
-						'mandatory' => true
+						'mandatory' => true,
+						'autocomplete' => 'off'
 					),
 					'admin_password_suggestion' => array(
 						'label' => $lng['customer']['generated_pwd'],
diff --git a/lib/formfields/admin/admin/formfield.admin_edit.php b/lib/formfields/admin/admin/formfield.admin_edit.php
index 1ac8def9..c21b26fb 100644
--- a/lib/formfields/admin/admin/formfield.admin_edit.php
+++ b/lib/formfields/admin/admin/formfield.admin_edit.php
@@ -41,6 +41,7 @@ return array(
 					'admin_password' => array(
 						'label' => $lng['login']['password'].' ('.$lng['panel']['emptyfornochanges'].')',
 						'type' => 'password',
+						'autocomplete' => 'off',
 						'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true)
 					),
 					'admin_password_suggestion' => array(
diff --git a/lib/formfields/admin/customer/formfield.customer_add.php b/lib/formfields/admin/customer/formfield.customer_add.php
index b56698db..550ba965 100644
--- a/lib/formfields/admin/customer/formfield.customer_add.php
+++ b/lib/formfields/admin/customer/formfield.customer_add.php
@@ -47,6 +47,7 @@ return array(
 					'new_customer_password' => array(
 						'label' => $lng['login']['password'],
 						'type' => 'password',
+						'autocomplete' => 'off'
 					),
 					'new_customer_password_suggestion' => array(
 						'label' => $lng['customer']['generated_pwd'],
diff --git a/lib/formfields/admin/customer/formfield.customer_edit.php b/lib/formfields/admin/customer/formfield.customer_edit.php
index 13758e37..9faf14f1 100644
--- a/lib/formfields/admin/customer/formfield.customer_edit.php
+++ b/lib/formfields/admin/customer/formfield.customer_edit.php
@@ -52,7 +52,8 @@ return array(
 					),
 					'new_customer_password' => array(
 						'label' => $lng['login']['password'].' ('.$lng['panel']['emptyfornochanges'].')',
-						'type' => 'password'
+						'type' => 'password',
+						'autocomplete' => 'off'
 					),
 					'new_customer_password_suggestion' => array(
 						'label' => $lng['customer']['generated_pwd'],
diff --git a/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php b/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php
index 1ea07305..1b8d5f89 100644
--- a/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php
+++ b/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php
@@ -31,7 +31,8 @@ return array(
 					),
 					'email_password' => array(
 						'label' => $lng['login']['password'],
-						'type' => 'password'
+						'type' => 'password',
+						'autocomplete' => 'off'
 					),
 					'email_password_suggestion' => array(
 						'label' => $lng['customer']['generated_pwd'],
diff --git a/lib/formfields/customer/email/formfield.emails_addaccount.php b/lib/formfields/customer/email/formfield.emails_addaccount.php
index 9585ed23..27589051 100644
--- a/lib/formfields/customer/email/formfield.emails_addaccount.php
+++ b/lib/formfields/customer/email/formfield.emails_addaccount.php
@@ -31,7 +31,8 @@ return array(
 					),
 					'email_password' => array(
 						'label' => $lng['login']['password'],
-						'type' => 'password'
+						'type' => 'password',
+						'autocomplete' => 'off'
 					),
 					'email_password_suggestion' => array(
 						'label' => $lng['customer']['generated_pwd'],
diff --git a/lib/formfields/customer/extras/formfield.htpasswd_add.php b/lib/formfields/customer/extras/formfield.htpasswd_add.php
index 7ecf2472..85e8a1a2 100644
--- a/lib/formfields/customer/extras/formfield.htpasswd_add.php
+++ b/lib/formfields/customer/extras/formfield.htpasswd_add.php
@@ -37,7 +37,8 @@ return array(
 					),
 					'directory_password' => array(
 						'label' => $lng['login']['password'],
-						'type' => 'password'
+						'type' => 'password',
+						'autocomplete' => 'off'
 					),
 					'directory_password_suggestion' => array(
 						'label' => $lng['customer']['generated_pwd'],
diff --git a/lib/formfields/customer/extras/formfield.htpasswd_edit.php b/lib/formfields/customer/extras/formfield.htpasswd_edit.php
index fae3cac7..38a84ca0 100644
--- a/lib/formfields/customer/extras/formfield.htpasswd_edit.php
+++ b/lib/formfields/customer/extras/formfield.htpasswd_edit.php
@@ -36,7 +36,8 @@ return array(
 					),
 					'directory_password' => array(
 						'label' => $lng['login']['password'],
-						'type' => 'password'
+						'type' => 'password',
+						'autocomplete' => 'off'
 					),
 					'directory_password_suggestion' => array(
 						'label' => $lng['customer']['generated_pwd'],
diff --git a/lib/formfields/customer/ftp/formfield.ftp_add.php b/lib/formfields/customer/ftp/formfield.ftp_add.php
index 0c625870..c7913b8f 100644
--- a/lib/formfields/customer/ftp/formfield.ftp_add.php
+++ b/lib/formfields/customer/ftp/formfield.ftp_add.php
@@ -44,6 +44,7 @@ return array(
 					'ftp_password' => array(
 						'label' => $lng['login']['password'],
 						'type' => 'password',
+						'autocomplete' => 'off'
 					),
 					'ftp_password_suggestion' => array(
 						'label' => $lng['customer']['generated_pwd'],
diff --git a/lib/formfields/customer/ftp/formfield.ftp_edit.php b/lib/formfields/customer/ftp/formfield.ftp_edit.php
index fbbf74ac..3ac5cf6f 100644
--- a/lib/formfields/customer/ftp/formfield.ftp_edit.php
+++ b/lib/formfields/customer/ftp/formfield.ftp_edit.php
@@ -39,6 +39,7 @@ return array(
 						'label' => $lng['login']['password'],
 						'desc' => $lng['ftp']['editpassdescription'],
 						'type' => 'password',
+						'autocomplete' => 'off'
 					),
 					'ftp_password_suggestion' => array(
 						'label' => $lng['customer']['generated_pwd'],
diff --git a/lib/formfields/customer/mysql/formfield.mysql_add.php b/lib/formfields/customer/mysql/formfield.mysql_add.php
index d580052e..3112c428 100644
--- a/lib/formfields/customer/mysql/formfield.mysql_add.php
+++ b/lib/formfields/customer/mysql/formfield.mysql_add.php
@@ -36,6 +36,7 @@ return array(
 					'mysql_password' => array(
 						'label' => $lng['login']['password'],
 						'type' => 'password',
+						'autocomplete' => 'off'
 					),
 					'mysql_password_suggestion' => array(
 						'label' => $lng['customer']['generated_pwd'],
diff --git a/lib/formfields/customer/mysql/formfield.mysql_edit.php b/lib/formfields/customer/mysql/formfield.mysql_edit.php
index a7bcd8a2..2a579047 100644
--- a/lib/formfields/customer/mysql/formfield.mysql_edit.php
+++ b/lib/formfields/customer/mysql/formfield.mysql_edit.php
@@ -42,6 +42,7 @@ return array(
 					'mysql_password' => array(
 						'label' => $lng['changepassword']['new_password_ifnotempty'],
 						'type' => 'password',
+						'autocomplete' => 'off'
 					),
 					'mysql_password_suggestion' => array(
 						'label' => $lng['customer']['generated_pwd'],