add password fields
Merge branch 'master' of github.com:duncanjbrown/Archetype