User model
Fix some email regex bugs