Added password reset and settings fixes