Fixes #409
Merge pull request #423 from SpiderOak/issue-409-passcode-challenge-layering

Issue 409 - passcode challenge layering