Change password 2312

This is ready merge.