--- salesforce_api.module	25 Feb 2009 23:46:02 -0000	1.2.2.3
+++ salesforce_api.module	17 Mar 2009 18:17:22 -0000
@@ -183,11 +203,27 @@ function salesforce_api_settings_form() 
     ),
     '#default_value' => variable_get('salesforce_api_error_log', SALESFORCE_LOG_ALL),
   );
-
+  
+  //Validate handler makes sure that the salesforce_api_password doesn't get set to null on accident
+  $form['#validate'][] = 'salesforce_api_settings_form_validate';
   return system_settings_form($form);
 }
 
 /**
+ * FAPI _validate handler to ensure that salesforce_api_password doesn't get reset to null on accident
+**/
+
+function salesforce_api_settings_form_validate($form, &$form_state) {
+  //if the user hit "Save Configuration" and the required field salesforce_api_password is blank
+  //try to get it from variables
+  if(t($form_state['values']['submit']) == t($form_state['values']['op'])
+  && empty($form_state['values']['salesforce_api_password'])
+  && $pass = variable_get('salesforce_api_password', FALSE)) {
+    $form_state['values']['salesforce_api_password'] = $pass;
+  }
+}
+
+/**
  * Creates an object used for communicating with the Salesforce server and
  *   performs a login to verify the API credentials.
  *