Bug 847552 - Create a Pass Code Screen Updates (followup)
Merge pull request #9012 from samjoch/bug-847552-followup

Bug 847552 - Create a Pass Code Screen Updates (followup)