Ensure that default behaviour is to match user
to remote user name

Change-Id: Iadabb5c47004786af6fb6e2e6ac0590fb4a887d8
Signed-off-by: Piers Harding <piers@catalyst.net.nz>