diff --git a/includes/form.inc b/includes/form.inc
index 9e63aa900935f1f082a4a34999ca919079e64690..d0a8e5dbe082e878fd1d2770a8f457c67c701715 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -556,6 +556,10 @@ function form_builder($form_id, $form) {
       $form['#id'] =  'edit-' . implode('-', $form['#parents']);
     }
 
+    if (isset($form['#disabled']) && $form['#disabled']) {
+      $form['#attributes']['disabled'] = 'disabled';
+    }
+
     if (!isset($form['#value']) && !array_key_exists('#value', $form)) {
       if (($form['#programmed']) || ((!isset($form['#access']) || $form['#access']) && isset($_POST['edit']) && ($_POST['edit']['form_id'] == $form_id))) {
         $edit = $form['#post']['edit'];
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 4bb83df6c3851a0ad49b12d7c95a6db20f6d0bc8..86af8f0b17b601647ea28375f66ee2b05cca484f 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -438,7 +438,7 @@ function comment_admin_settings() {
     '#description' => t('This option is enabled when anonymous users have permission to post comments on the <a href="@url">permissions page</a>.', array('@url' => url('admin/user/access'))),
   );
   if (!user_access('post comments', user_load(array('uid' => 0)))) {
-    $form['posting_settings']['comment_anonymous']['#attributes'] = array('disabled' => 'disabled');
+    $form['posting_settings']['comment_anonymous']['#disabled'] = TRUE;
   }
 
   $form['posting_settings']['comment_subject_field'] = array(
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index c310ba51e4b94c9f64fc81735bb078e7b532be4d..ba0628a06f1734ae4ec4e34182e7935c212c26bd 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -425,7 +425,7 @@ function filter_admin_format_form($format = NULL) {
       '#default_value' => ($default || $checked),
     );
     if ($default) {
-      $form['roles'][$rid]['#attributes'] = array('disabled' => 'disabled');
+      $form['roles'][$rid]['#disabled'] = TRUE;
     }
   }
   // Table with filters
diff --git a/modules/system/system.module b/modules/system/system.module
index 045d09b5e15fae1a4cfbe1776df015c0256061a1..b9dfe9b13861ab71c9bc39aac6e3bed8eea6ab4d 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -538,7 +538,7 @@ function system_clean_url_settings() {
   if (!variable_get('clean_url', 0)) {
     if (strpos(request_uri(), '?q=') !== FALSE) {
       $form['clean_url']['#description'] .= t(' Before enabling clean URLs, you must perform a test to determine if your server is properly configured. If you are able to see this page again after clicking the "Run the clean URL test" link, the test has succeeded and the radio buttons above will be available. If instead you are directed to a "Page not found" error, you will need to change the configuration of your server. The <a href="@handbook">handbook page on Clean URLs</a> has additional troubleshooting information. !run-test', array('@handbook' => 'http://drupal.org/node/15365', '!run-test' => '<a href ="'. base_path() . 'admin/settings/clean-urls">'. t('Run the clean URL test') .'</a>'));
-      $form['clean_url']['#attributes'] = array('disabled' => 'disabled');
+      $form['clean_url']['#disabled'] = TRUE;
     }
     else {
       $form['clean_url']['#description'] .= t(' You have successfully demonstrated that clean URLs work on your server. You are welcome to enable/disable them as you wish.');
@@ -1413,7 +1413,7 @@ function system_theme_settings($key = '') {
       // disable search box if search.module is disabled
       $form['theme_settings'][$name] = array('#type' => 'checkbox', '#title' => $title, '#default_value' => $settings[$name]);
       if (isset($disabled[$name])) {
-        $form['theme_settings'][$name]['#attributes'] = array('disabled' => 'disabled');
+        $form['theme_settings'][$name]['#disabled'] = TRUE;
       }
     }
   }