fix for the changepass issue