diff --git a/client/src/views/email/fields/compose-from-address.js b/client/src/views/email/fields/compose-from-address.js
index 5e37e4207f..5969a81d19 100644
--- a/client/src/views/email/fields/compose-from-address.js
+++ b/client/src/views/email/fields/compose-from-address.js
@@ -46,11 +46,15 @@ Espo.define('views/email/fields/compose-from-address', 'views/fields/base', func
                 this.list.push(this.getUser().get('emailAddress'));
             }*/
 
+            this.list.push(this.getUser().get('emailAddress'));
+
             var emailAddressList = this.getUser().get('emailAddressList') || [];
             emailAddressList.forEach(function (item) {
                 this.list.push(item);
             }, this);
 
+            this.list = _.uniq(this.list);
+
             if (this.getConfig().get('outboundEmailIsShared') && this.getConfig().get('outboundEmailFromAddress')) {
                 var address = this.getConfig().get('outboundEmailFromAddress');
                 if (!~this.list.indexOf(address)) {