diff --git a/UI/Templates/PreferencesUI/UIxAccountEditor.wox b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
index 37a5dd6ba..eddfac80d 100644
--- a/UI/Templates/PreferencesUI/UIxAccountEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
@@ -131,7 +131,7 @@
ng-click="$AccountDialogController.setDefaultIdentity($event, $index)">
{{ identity.isDefault ? 'favorite' : 'favorite_border' }}
- chevron_right
+ expand_more
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index d49828ae4..b0d21a416 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -75,7 +75,7 @@
ng-hide="user.uid != acl.selectedUid || user.$isSpecial()">
delete
- chevron_right
+ expand_more
diff --git a/UI/WebServerResources/js/Preferences/AccountDialogController.js b/UI/WebServerResources/js/Preferences/AccountDialogController.js
index a5df047c1..661f86612 100644
--- a/UI/WebServerResources/js/Preferences/AccountDialogController.js
+++ b/UI/WebServerResources/js/Preferences/AccountDialogController.js
@@ -98,6 +98,8 @@
var firstReadonlyIndex = _.findIndex(this.account.identities, { isReadOnly: 1 });
var identity = {};
+ if (firstReadonlyIndex < 0)
+ firstReadonlyIndex = this.account.identities.length;
if (this.customFromIsReadonly())
identity.fullName = this.account.identities[0].fullName;
this.account.identities.splice(Math.max(firstReadonlyIndex, 0), 0, identity);