discovery short-circuits without a current user

- current user now modelled explicitly