Add authenticate and more email checks