#613 introduces test failures

See #613 and #542 

Looks like I forgot an` if current_user`

We'll have to backport this fix to 3.3.0, since I think it will cause the app to crash if a client tries to set up from scratch.