Fixed to Auth checks

Fixes across all Auth checks to make them work properly