Added login and email verification support