After adding email fields