Grouping Username and Password together

It is nicer to have Username and Password presented together
in the settings form.