Added check to verify credentials before making user wait