Resolve #3345580 "Unlock dialog does"

m4oliveirequested to merge
issue/field_protect-3345580:3345580-unlock-dialog-does into 1.x

Closes #3345580

Merge request reports