Templates - Missing Credential link

using version 9.2.6.0, and i'm trying to templatize a group of entries containing both credentials and sessions. What I want to have happen is be able to add a whole grouping from template, and have it linked to the associated credential for the session. Currently, it will create both the session entry, and the credential entry, but as soon as you open the session after it is created, it will have a error message pop up " Unable to find the credential entry, this setting will be lost!".

Please note that with the template, it does actually create the credential in the credentials repository, and it does create the session, it just seems to lose the link.

At a guess, when the template process is executed, it generates new UID's for the objects, and it's not going back through the sessions and adding in the new credential entry UID to the session.