Remove extra space from 'Site name' to match 'Username' format.
Also coincides with previous revisions for variable name-casing changes.