Added protection against a validated but empty email slot and introduced some protection against time issues