Partial isauth rewrite