Add password change
Merge branch 'work'