Merged the ManageAccount classes. Fixed login issues