Reapplied user label fix

After the label format changed this got fixed, then unfixed, then fixed again, then unfixed, so resubmitting the last fix to refix the currently unrerefixed state :)