linking up and fixing user/emails
Merge pull request #35 from mrkrstphr/fixing-user-emails

linking up and fixing user/emails