Add border when email is incorrect
Fix merge conflicts