More elegant auth handling