diff --git a/product/ERP5/Tool/TemplateTool.py b/product/ERP5/Tool/TemplateTool.py
index e84cce24464cd8e3fa5ab9f35b7264bb8b6ea8b7..4f6dc5d609ded8a1896c28a744159bd0f26bbabe 100644
--- a/product/ERP5/Tool/TemplateTool.py
+++ b/product/ERP5/Tool/TemplateTool.py
@@ -1056,7 +1056,7 @@ class TemplateTool (BaseTool):
           installed_version = ''
           installed_revision = ''
         version_state_title = version_state_title_dict[version_state]
-        uid = b64encode(cPickle.dumps((repository, id)))
+        uid = self.encodeRepositoryBusinessTemplateUid(repository, id)
         obj = newTempBusinessTemplate(self, 'temp_' + uid,
                                       version_state = version_state,
                                       version_state_title = version_state_title,