Some fixes
Merge pull request #191 from uptownjimmy/guestEmailFix

Some fixes