Correct labels etcetera

Correct the labels etcetera that are there, and the fact that the
password field was text not password.