MDL-60590 enrol_manual: Fix for race condition in button calculation