diff --git a/includes/form.inc b/includes/form.inc
index 442016a..626e692 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -2739,6 +2739,7 @@ function form_process_password_confirm($element) {
     '#title' => t('Password'),
     '#value' => empty($element['#value']) ? NULL : $element['#value']['pass1'],
     '#required' => $element['#required'],
+    '#autocomplete' => empty($element'#autocomplete']) ? NULL : $element['#autocomplete'],
     '#attributes' => array('class' => array('password-field')),
   );
   $element['pass2'] =  array(
@@ -2746,6 +2747,7 @@ function form_process_password_confirm($element) {
     '#title' => t('Confirm password'),
     '#value' => empty($element['#value']) ? NULL : $element['#value']['pass2'],
     '#required' => $element['#required'],
+    '#autocomplete' => empty($element['#autocomplete']) ? NULL : $element['#autocomplete'],
     '#attributes' => array('class' => array('password-confirm')),
   );
   $element['#element_validate'] = array('password_confirm_validate');
@@ -3660,14 +3662,14 @@ function theme_hidden($variables) {
  *   An associative array containing:
  *   - element: An associative array containing the properties of the element.
  *     Properties used: #title, #value, #description, #size, #maxlength,
- *     #placeholder, #required, #attributes, #autocomplete_path.
+ *     #placeholder, #autocomplete, #required, #attributes, #autocomplete_path.
  *
  * @ingroup themeable
  */
 function theme_textfield($variables) {
   $element = $variables['element'];
   $element['#attributes']['type'] = 'text';
-  element_set_attributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
+  element_set_attributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder', 'autocomplete'));
   _form_set_class($element, array('form-text'));
 
   $extra = '';
@@ -3719,13 +3721,13 @@ function theme_form($variables) {
  *   An associative array containing:
  *   - element: An associative array containing the properties of the element.
  *     Properties used: #title, #value, #description, #rows, #cols,
- *     #placeholder, #required, #attributes
+ *     #placeholder, #autocomplete, #required, #attributes
  *
  * @ingroup themeable
  */
 function theme_textarea($variables) {
   $element = $variables['element'];
-  element_set_attributes($element, array('id', 'name', 'rows', 'cols', 'placeholder'));
+  element_set_attributes($element, array('id', 'name', 'rows', 'cols', 'placeholder', 'autocomplete'));
   _form_set_class($element, array('form-textarea'));
 
   $wrapper_attributes = array(
@@ -3751,14 +3753,14 @@ function theme_textarea($variables) {
  *   An associative array containing:
  *   - element: An associative array containing the properties of the element.
  *     Properties used: #title, #value, #description, #size, #maxlength,
- *     #placeholder, #required, #attributes.
+ *     #placeholder, #autocomplete, #required, #attributes.
  *
  * @ingroup themeable
  */
 function theme_password($variables) {
   $element = $variables['element'];
   $element['#attributes']['type'] = 'password';
-  element_set_attributes($element, array('id', 'name', 'size', 'maxlength', 'placeholder'));
+  element_set_attributes($element, array('id', 'name', 'size', 'maxlength', 'placeholder', 'autocomplete'));
   _form_set_class($element, array('form-text'));
 
   return '<input' . drupal_attributes($element['#attributes']) . ' />';