Fix/account management page improvements