Add proper email validation
Tests with factory girl and stuff