task#5311 Fix layout password recovery