Change password fix Closes #2518.