diff --git a/includes/service.inc b/includes/service.inc
index f119c0b..fbc1b61 100755
--- a/includes/service.inc
+++ b/includes/service.inc
@@ -142,7 +142,8 @@ class SearchApiSolrService extends SearchApiAbstractService {
     $form['http']['http_pass'] = array(
       '#type' => 'password',
       '#title' => t('Password'),
-      '#default_value' => $options['http_pass'],
+      // #default_value is ignored for password fields
+      '#attributes' => array('value' => $options['http_pass']),
     );

     $form['advanced'] = array(