Continuing auth work, especially on admin component for users