diff --git a/UI/WebServerResources/js/Contacts/AddressBookController.js b/UI/WebServerResources/js/Contacts/AddressBookController.js
index 09da37ec9..c221dad89 100644
--- a/UI/WebServerResources/js/Contacts/AddressBookController.js
+++ b/UI/WebServerResources/js/Contacts/AddressBookController.js
@@ -131,10 +131,10 @@
 
     function newMessage($event, recipients) {
       Account.$findAll().then(function(accounts) {
-        var account = _.filter(accounts, function(o) {
+        var account = _.find(accounts, function(o) {
           if (o.id === 0)
             return o;
-        })[0];
+        });
 
         // We must initialize the Account with its mailbox
         // list before proceeding with message's creation
@@ -149,7 +149,7 @@
               controller: 'MessageEditorController',
               controllerAs: 'editor',
               locals: {
-                stateAccounts: accounts,
+                stateAccount: account,
                 stateMessage: message,
                 stateRecipients: recipients
               }