Manage Account Fix