Fixup user search using directory backends
Fixup initial templates to have recipient vars