Fixes to account section