Added user verification and admin verification