Minor fixes to account-settings