Fixed email issue, and issues with verification