Add secure passwords and password confirmation
Merge password branch