If I understand well, you removed the "all users" case from the MOUNT_TYPE_USER in the block below and put it inside a separate block here, correct ?