Passcode settings security updates
Merge pull request #485 from khawkins/passcode_updates

Passcode settings security updates