Moved auth around