Issue #221: Followup to restore completion task at the end of the install.
Merge branch '1.x' into 293/password-styling