diff --git a/include/class.email.php b/include/class.email.php
index a55a0e3e478733e3c277ab8b19083fa857b2b154..9f7ea95b0c76ceac926d5bdedea534afc1830ea4 100644
--- a/include/class.email.php
+++ b/include/class.email.php
@@ -245,6 +245,11 @@ class Email {
 
             if(!$id && !$vars['passwd'])
                 $errors['passwd']='Password required';
+            elseif($vars['passwd']
+                    && $vars['userid']
+                    && !Crypto::encrypt($vars['passwd'], SECRET_SALT, $vars['userid'])
+                    )
+                $errors['passwd'] = 'Unable to encrypt password - get technical support';
         }
 
         if($vars['mail_active']) {