ensure target user uses target username

Signed-off-by: Steve Finkelstein <sf@stevefink.net>