Previous auth fix was not very DRY