Userfields fixes, ordering etc...

Re-arranged order of Username and Passwords
Fixed the locale and added headings where it was missing for Account
info.