Revert "Revert "Password salt and hash""

This reverts commit a92af9781a8e6e4a118d1808aa026abbb34ecfc3.