Redo to single sign on for account piece