Apply result of "git diff anaconda-18.37.11-1..anaconda-20.25.16-1" and resolve conflicts.
Not only default setting, so one could leave account locked if entered password setting spoke.