diff --git a/src/Form/ASpaceConfigForm.php b/src/Form/ASpaceConfigForm.php
index 8073e2f..bab20f9 100644
--- a/src/Form/ASpaceConfigForm.php
+++ b/src/Form/ASpaceConfigForm.php
@@ -89,6 +89,12 @@ public function submitForm(array &$form, FormStateInterface $form_state): void {
       ->set('archivesspace_repository_ids', array_values($int_ids))
       ->save();
 
+    // Only overwrite the stored password if the user submitted a new one.
+    $password = $form_state->getValue('archivesspace_password');
+    if ($password === NULL || $password === '') {
+      $form_state->setValue('archivesspace_password', $config->get('archivesspace_password'));
+    }
+
     parent::submitForm($form, $form_state);
   }