Allows users to edit settings without providing password

Previously a user could not update there settings without providing there password. Now they only need to provide a password when updating email field or setting a new password. 
Also cleaned up the sample data to maker it a bit DRYer.
This if statement might be best if moved into it's own method.