Heri | #2105 & 2123: Two error messages appear on Edit registration form for one of the scenarios