Consider moving this into it's own commit, and removing the `instanceuser` template filter now that it is always available in the template.