Change password 2312

Ready for internal review and then merge.