Bug fixes to account page