diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index d91bbe5c1..82152eba5 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -168,7 +168,7 @@
           if (data.name.split(' ').length)
             data.shortname = data.name.split(' ')[0].replace('\'','');
         }
-        else {
+        else if (data.email) {
           data.full = '<' + data.email + '>';
           data.shortname = data.email.split('@')[0];
         }