Added password reset and some alerts