diff --git a/apachesolr.module b/apachesolr.module
index 1b8bf70..9c8512c 100644
--- a/apachesolr.module
+++ b/apachesolr.module
@@ -2388,6 +2388,12 @@ function apachesolr_settings_form($form, $server_id) {
     '#submit' => array('apachesolr_settings_form_reset'),
   );
 
+  if (isset($form['#submit'])) {
+    $form['actions']['submit']['#submit'] = array_merge($form['actions']['submit']['#submit'], $form['#submit']);
+    $form['actions']['reset']['#submit'] = array_merge($form['actions']['reset']['#submit'], $form['#submit']);
+    unset($form['#submit']);
+  }
+
   return $form;
 }