Revert "Password Removal"

This reverts commit e35b28563edb874fefe6797d307bcf916c34a1db.