Tidied up sample_data
Editing user settings now only requires password when changing email or password.