My Account page is broken - #5566

Fixed various issues with
the my-account page that was broken.