Fixes for change password