Separate password fields, and make current password compulsory

Resolves #50