User's email is being added to user defaults
Merge remote-tracking branch 'origin/develop' into develop