diff --git a/src/app/contentManagement/controllers/JnlpController.php b/src/app/contentManagement/controllers/JnlpController.php
index d9f5afd4ae7a4d29494bf16bad9d2848cc2938fe..9762bf591d184c340868a6615b24e66a2ecf6410 100755
--- a/src/app/contentManagement/controllers/JnlpController.php
+++ b/src/app/contentManagement/controllers/JnlpController.php
@@ -325,14 +325,15 @@ class JnlpController
     public function isLockFileExisting(Request $request, Response $response, array $aArgs)
     {
         $tmpPath = CoreConfigModel::getTmpPath();
-        $lockFileName = "{$GLOBALS['id']}_maarchCM_{$aArgs['jnlpUniqueId']}.lck";
+        $fileTrunk = "{$GLOBALS['id']}_maarchCM_{$aArgs['jnlpUniqueId']}";
+        $lockFileName = "{$fileTrunk}.lck";
 
         $fileFound = false;
         if (file_exists($tmpPath . $lockFileName)) {
             $fileFound = true;
         }
 
-        return $response->withJson(['lockFileFound' => $fileFound]);
+        return $response->withJson(['lockFileFound' => $fileFound, 'fileTrunk' => $fileTrunk]);
     }
 
     private static function generateResponse(array $aArgs)
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index d1c647abb1c7fc93605b33d45baec54cc6df7a78..1033956903d447640d24e7e5fef77063bb8e1186 100755
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -1338,14 +1338,17 @@ class UserController
         }
 
         $templates = TemplateModel::getWithAssociation([
-            'select'    => ['DISTINCT(templates.template_id)','templates.template_label', 'templates.template_style'],
+            'select'    => ['DISTINCT(templates.template_id)', 'templates.template_label', 'templates.template_file_name'],
             'where'     => ['templates.template_type = ?', '(templates_association.value_field in (?) OR templates_association.template_id IS NULL)'],
             'data'      => ['OFFICE', $entities],
             'orderBy'   => ['templates.template_label']
         ]);
 
         foreach ($templates as $key => $template) {
-            $templates[$key] = ['id' => $template['template_id'], 'label' => $template['template_label'], 'style' => $template['template_style']];
+            $explodeFile = explode('.', $template['template_file_name']);
+            $ext = $explodeFile[count($explodeFile) - 1];
+
+            $templates[$key] = ['id' => $template['template_id'], 'label' => $template['template_label'], 'extension' => $ext];
         }
 
         return $response->withJson(['templates' => $templates]);