Merge Feature/check email

Review enhanced email checking