CLUB-577, password reset do not merge it yet