Fixed issue with email verify routine