[MERGE] Fix bug #367726 by reverting some default user handling introduced while fixing bug #256612

[Vincent Ladeuil]

A non-text attachment was scrubbed...
Name: 367726-ssh-default-user-4305.patch
Type: text/x-patch
Size: 12783 bytes
Desc: BZR merge
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090427/c57953c8/attachment-0001.bin