2.5.+ edits to 'change user password'