Added oauth check