diff --git a/salesforce_api/salesforce_api.admin.inc b/salesforce_api/salesforce_api.admin.inc
index 3135498..4512684 100644
--- a/salesforce_api/salesforce_api.admin.inc
+++ b/salesforce_api/salesforce_api.admin.inc
@@ -57,29 +57,24 @@ function salesforce_api_settings_form($form, &$form_state) {
         API credentials will prevent your website from connecting to Salesforce.com',
     );
   }
-  $form['api']['encryption'] = array(
-    '#type' => 'item',
-    '#title' => 'Encryption',
-    'status' => array(
-      '#type' => 'item',
-      '#title' => FALSE,
-    ),
-  );
+
   if (salesforce_api_encryption_available(array('display_all' => TRUE))) {
-    $form['api']['encryption']['status']['#markup'] =
-      'Encryption is available and configured properly.';
+    $form['api']['encryption'] = array(
+      '#type' => 'fieldset',
+      '#title' => 'Encryption',
+    );
+    $form['api']['encryption']['status'] = array(
+      '#markup' => 'Encryption is available and configured properly.',
+      '#prefix' => '<div class = "messages status">',
+      '#suffix' => '</div>',
+    );
     $form['api']['encryption']['salesforce_api_encrypt'] = array(
       '#type' => 'checkbox',
-      '#title' => 'Encrypt Salesforce credentials (HIGHLY RECOMMENDED)',
+      '#title' => 'Encrypt Salesforce credentials',
       '#description' => 'Note: enabling this setting will not encrypt existing credentials.',
       '#default_value' => TRUE,
     );
   }
-  else {
-    $form['api']['encryption']['status']['#markup'] =
-      '<span class="error"><a href="http://drupal.org/project/aes" target="_blank">AES</a> is not
-      installed - your login credentials will not be encrypted.</span>';
-  }
 
   $form['log'] = array(
     '#type' => 'fieldset',
diff --git a/salesforce_api/salesforce_api.install b/salesforce_api/salesforce_api.install
index 80d8294..b88e841 100644
--- a/salesforce_api/salesforce_api.install
+++ b/salesforce_api/salesforce_api.install
@@ -198,8 +198,8 @@ function salesforce_api_requirements($phase) {
       $severity = REQUIREMENT_WARNING;
     }
     elseif (!salesforce_api_encryption_available(array('check_config' => FALSE))) {
-      $description = t('Encryption is unavailable. Using encryption is <strong>highly recommended</strong> in order to better secure your data.');
-      $severity = REQUIREMENT_WARNING;
+      $description = t('Encryption is unavailable. Using encryption is recommended in order to better secure your data.');
+      $severity = REQUIREMENT_INFO;
     }
     elseif (!salesforce_api_encryption_available(array('check_config' => TRUE))) {
       $description = t('Salesforce encryption is enabled but not configured securely.');
diff --git a/salesforce_api/salesforce_api.module b/salesforce_api/salesforce_api.module
index 70d24b9..9076646 100644
--- a/salesforce_api/salesforce_api.module
+++ b/salesforce_api/salesforce_api.module
@@ -2319,12 +2319,12 @@ function salesforce_api_encryption_available($options = array()) {
   $warnings = array();
 
   if (!module_exists('aes')) {
-    $errors[] = 'AES Encryption module is not installed.';
+    $warnings[] = 'AES Encryption module is not installed.';
   }
   elseif ($check_config) {
     if (!variable_get('aes_key_path', FALSE)
       || variable_get('aes_key_storage_method', FALSE) != 'File') {
-      $warnings[] = 'AES Encryption is installed but not configured securely.
+      $errors[] = 'AES Encryption is installed but not configured securely.
         Please go <a href="/admin/settings/aes">configure AES Encryption to use
         file storage</a> to enable encryption for Salesforce credentials.';
     }
@@ -2336,12 +2336,6 @@ function salesforce_api_encryption_available($options = array()) {
     }
   }
 
-  if ($display_warnings || $display_all) {
-    foreach ($warnings as $msg) {
-      drupal_set_message(t($msg), 'warning');
-    }
-  }
-
   switch ($fail_threshold) {
     case 'errors':
       if (empty($errors)) {