diff --git a/salesforce_api/salesforce_api.module b/salesforce_api/salesforce_api.module
index 3ffc97d..fba9d58 100644
--- a/salesforce_api/salesforce_api.module
+++ b/salesforce_api/salesforce_api.module
@@ -1769,11 +1769,13 @@ function salesforce_api_import_salesforce_field_map_submit($form, &$form_state)
  * transition easier.
  */
 function salesforce_api_decrypt($value) {
-  return aes_decrypt($value);
+  $value = (module_exists('aes')) ? aes_decrypt($value) : $value;
+	return $value;
 }
 
 function salesforce_api_encrypt($value) {
-  return aes_encrypt($value);
+  $value = (module_exists('aes')) ? aes_encrypt($value) : $value;
+	return $value;
 }
 
 function salesforce_api_encryption_available($options = array()) {