Follow-up fix for bug#7337.
Fixed bug#10099: Missing challenge token checks on customer interface.

Conflicts:
	CHANGES.md
Merge remote-tracking branch 'upstream/rel-3_2' into rel-3_2