BZ-0000: Updating authentication check