diff --git a/modules/encryptfapi/encryptfapi.module b/modules/encryptfapi/encryptfapi.module
index 682a075..3a06ff4 100644
--- a/modules/encryptfapi/encryptfapi.module
+++ b/modules/encryptfapi/encryptfapi.module
@@ -38,12 +38,11 @@ function _encryptfapi_form_submit($form, &$form_state) {
     if (is_array($instructions)) {
       $method = isset($instructions['method']) ? $instructions['method'] : NULL;
       $provider = isset($instructions['key_provider']) ? $instructions['key_provider'] : NULL;
-      $encrypted = encrypt($value, array(), $method, $provider);
+      $encrypted = encrypt($value, array('base64' => TRUE), $method, $provider);
     }
     else {
-      $encrypted = encrypt($value);
+      $encrypted = encrypt($value, array('base64' => TRUE));
     }
-
     form_set_value(array('#parents' => $tree), $encrypted, $form_state);
   }
 }
@@ -132,8 +131,8 @@ function _encryptfapi_get_accepted_element_types() {
 function _encryptfapi_element_prerender($element) {
   if (isset($element['#encrypt']) && $element['#encrypt'] && isset($element['#default_value'])) {
     // TODO: Support for specified enc. method and key provider.
-    $element['#default_value'] = decrypt($element['#default_value']);
-    $element['#value'] = decrypt($element['#value']);
+    $element['#default_value'] = decrypt($element['#default_value'], array('base64' => TRUE));
+    $element['#value'] = decrypt($element['#value'], array('base64' => TRUE));
   }
   return $element;
 }
diff --git a/plugins/encryption_methods/default.inc b/plugins/encryption_methods/default.inc
index a041014..0b3d673 100644
--- a/plugins/encryption_methods/default.inc
+++ b/plugins/encryption_methods/default.inc
@@ -23,6 +23,10 @@ function encrypt_encryption_methods_basic($op = 'encrypt', $text = '', $key = ''
   // Caching length operations to speed up for loops.
   $text_length = strlen($text);
   $key_length = strlen($key);
+  $use_base64 = array_key_exists('base64', $options) && $options['base64'] !== FALSE;
+  if ($use_base64 && $op == 'decrypt') {
+    $text = base64_decode($text);
+  }
 
   // Loop through each character.
   for ($i = 0; $i < $text_length; $i++) {
@@ -38,5 +42,9 @@ function encrypt_encryption_methods_basic($op = 'encrypt', $text = '', $key = ''
     $processed_text .= $char;
   }
 
+  if ($use_base64 && $op == 'encrypt') {
+    $processed_text = base64_encode($processed_text);
+  }
+
   return $processed_text;
 }