Default to use the username as passed in by the user.
Default to use the username as passed in by the user.

git-svn-id: 193148810cf65385f3a195dbc9a8b504846da3a2@23843 ec53bebd-3082-4978-b11e-865c3cabbd6b

madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal