changes for forgot and admin