diff --git a/salesforce_api/salesforce_api.admin.inc b/salesforce_api/salesforce_api.admin.inc
index 82960e5..fdeee73 100644
--- a/salesforce_api/salesforce_api.admin.inc
+++ b/salesforce_api/salesforce_api.admin.inc
@@ -10,6 +10,15 @@
  * The settings form at admin/settings/salesforce.
  */
 function salesforce_api_settings_form($form, &$form_state) {
+  // Test connection to Salesforce
+  $connection = salesforce_api_connect(FALSE, FALSE, FALSE, TRUE);
+  if (is_object($connection)) {
+    drupal_set_message(t('Connection to Salesforce established.'));
+  }
+  else {
+    drupal_set_message(t('Connection to Salesforce failed.'), 'error');
+  }
+
   $form = array();
 
   // Let user know if read-only is set
@@ -236,20 +245,6 @@ function salesforce_api_settings_form_validate($form, &$form_state) {
     // If we got errors already no need to continue with validation.
     return;
   }
-
-  // If we are setting or resetting values, test the connection.
-  $connection = salesforce_api_connect($values['salesforce_api_username'],
-    $values['salesforce_api_password'], $values['salesforce_api_token'], TRUE);
-  if (is_object($connection)) {
-    drupal_set_message(t('Connection established. Salesforce credentials updated.'));
-  }
-  else {
-    drupal_set_message(
-      t('Resetting Salesforce API credentials failed.'), 'error');
-    form_set_error('salesforce_api_username', t('Unable to connect to Salesforce. Please check your credentials.'));
-    form_set_error('salesforce_api_password');
-    form_set_error('salesforce_api_token');
-  }
 }
 
 /**