Conditionally re-add user lookup

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>
Comments

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>