Rejigging auth checking