Lenient mobile auth

One cleanup commit, so likely easy to review commit by commit