Update user.py
Merge pull request #160 from georstef/patch-1

name_and_email_merged_changed