Merge pull request #1432 from mozilla/hotfix1425

Place the entire "If you're at a public computer such as a library or internet cafe, we'll ask you..." on a single line.  closes #1425