Fix session checking code
Fix bug 1099007 - Stop using email directly