diff --git a/message/output/email/message_output_email.php b/message/output/email/message_output_email.php
index 0bd91655ea8..3edfb1f089b 100644
--- a/message/output/email/message_output_email.php
+++ b/message/output/email/message_output_email.php
@@ -66,14 +66,9 @@ class message_output_email extends message_output {
     function config_form($preferences){
         global $USER;
         $string = get_string('email','message_email').': <input size="30" name="email_email" value="'.$preferences->email_email.'" />';
-        if (empty($preferences->email_email)) {
-            $userdefaultemail = null;
-            if (empty($preferences->userdefaultemail)) {
-                $userdefaultemail = $USER->email;
-            } else {
-                $userdefaultemail = $preferences->userdefaultemail;
-            }
-            $string .= ' ('.get_string('default').': '.$userdefaultemail.')';
+
+        if (empty($preferences->email_email) && !empty($preferences->userdefaultemail)) {
+            $string .= ' ('.get_string('default').': '.$preferences->userdefaultemail.')';
         }
         return $string;
     }