change email improvements
populate form field with current user email
fixed bad use of kwargs
Merge branch 'fixusersettings'