diff --git a/addons/api/addon/models/account.js b/addons/api/addon/models/account.js
index 4f880e07d..de5209c34 100644
--- a/addons/api/addon/models/account.js
+++ b/addons/api/addon/models/account.js
@@ -16,11 +16,15 @@ export default class AccountModel extends GeneratedAccountModel {
    * Convenience for getting username in account.
    * @type {string}
    */
-  @computed('attributes')
+  @computed('attributes.{login_name}')
   get username() {
-    if(this.type === 'password') {
-      return this.attributes.login_name;
+    let username = '';
+    switch (this.type) {
+      case 'password':
+        username = this.attributes.login_name;
+        break;
     }
+    return username;
   }
 
   // =methods
diff --git a/addons/api/tests/unit/models/account-test.js b/addons/api/tests/unit/models/account-test.js
index f6cbfbcc5..f937b3c26 100644
--- a/addons/api/tests/unit/models/account-test.js
+++ b/addons/api/tests/unit/models/account-test.js
@@ -17,7 +17,7 @@ module('Unit | Model | account', function (hooks) {
       name: 'name',
       type: 'password',
     });
-    assert.equal(model.username, null);
+    assert.notOk(model.username);
     model.attributes.login_name = 'username';
     assert.equal(model.username, 'username');
   });