Fix assignation of user controlled system badges

Closes #698