Grouping Username and Password together

It is nicer to have Username and Password presented together
in the settings form.
Merge pull request #811 from manojlds/patch-1

Grouping Username and Password together