diff --git a/modules/encryptfapi/encryptfapi.module b/modules/encryptfapi/encryptfapi.module
index 682a075..d5a638e 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 = convert_uuencode(encrypt($value, array(), $method, $provider));
     }
     else {
-      $encrypted = encrypt($value);
+      $encrypted = convert_uuencode(encrypt($value));
     }
-
     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(convert_uudecode($element['#default_value']));
+    $element['#value'] = decrypt(convert_uudecode($element['#value']));
   }
   return $element;
 }
