diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index 611fa523b27755da64d6fa057c0fe2382553eee7..16d04219212b58fd8d3da5b7322fcc96804fade0 100755
--- a/src/app/folder/controllers/FolderController.php
+++ b/src/app/folder/controllers/FolderController.php
@@ -449,7 +449,7 @@ class FolderController
                 $attachments = AttachmentModel::getOnView([
                     'select'    => ['COUNT(res_id)', 'res_id_master'],
                     'where'     => ['res_id_master in (?)', 'status not in (?)', 'attachment_type not in (?)', '((status = ? AND typist = ?) OR status != ?)'],
-                    'data'      => [$resIds, ['DEL', 'OBS'], $excludeAttachmentTypes, 'TMP', $GLOBALS['userId'], 'TMP'],
+                    'data'      => [$resIds, ['DEL', 'OBS'], $excludeAttachmentTypes, 'TMP', $GLOBALS['id'], 'TMP'],
                     'groupBy'   => ['res_id_master']
                 ]);
 
diff --git a/src/app/resource/controllers/ExportController.php b/src/app/resource/controllers/ExportController.php
index d90d96ab0ffa69da56c488785a6d389afed60bf2..ea7289c2dd69bd7d938bb80c6cb2cf7e0a09947e 100644
--- a/src/app/resource/controllers/ExportController.php
+++ b/src/app/resource/controllers/ExportController.php
@@ -263,7 +263,7 @@ class ExportController
                         $aRecipients = empty($recipients[$resource['res_id']]) ? [] : $recipients[$resource['res_id']];
                         $csvContent[] = implode("\n\n", $aRecipients);
                     } elseif ($value['value'] == 'getTypist') {
-                        $csvContent[] = UserModel::getLabelledUserById(['login' => $resource['typist']]);
+                        $csvContent[] = UserModel::getLabelledUserById(['id' => $resource['typist']]);
                     } elseif ($value['value'] == 'getAssignee') {
                         $csvContent[] = UserModel::getLabelledUserById(['login' => $resource['dest_user']]);
                     } elseif ($value['value'] == 'getTags') {
@@ -381,7 +381,7 @@ class ExportController
                             $content[] = implode("\n\n", $aRecipients);
                         }
                     } elseif ($value['value'] == 'getTypist') {
-                        $content[] = UserModel::getLabelledUserById(['login' => $resource['typist']]);
+                        $content[] = UserModel::getLabelledUserById(['id' => $resource['typist']]);
                     } elseif ($value['value'] == 'getAssignee') {
                         $content[] = UserModel::getLabelledUserById(['login' => $resource['dest_user']]);
                     } elseif ($value['value'] == 'getTags') {
diff --git a/src/app/resource/controllers/ResourceListController.php b/src/app/resource/controllers/ResourceListController.php
index c1798f29547b1fd800fdfe400db3448620b6797e..3d7f69ba0d9dbf5fb45567d8a028744d0e7e3b61 100644
--- a/src/app/resource/controllers/ResourceListController.php
+++ b/src/app/resource/controllers/ResourceListController.php
@@ -94,7 +94,7 @@ class ResourceListController
             $attachments = AttachmentModel::getOnView([
                 'select'    => ['COUNT(res_id)', 'res_id_master'],
                 'where'     => ['res_id_master in (?)', 'status not in (?)', 'attachment_type not in (?)', '((status = ? AND typist = ?) OR status != ?)'],
-                'data'      => [$resIds, ['DEL', 'OBS'], $excludeAttachmentTypes, 'TMP', $GLOBALS['userId'], 'TMP'],
+                'data'      => [$resIds, ['DEL', 'OBS'], $excludeAttachmentTypes, 'TMP', $GLOBALS['id'], 'TMP'],
                 'groupBy'   => ['res_id_master']
             ]);
 
diff --git a/src/app/resource/controllers/SummarySheetController.php b/src/app/resource/controllers/SummarySheetController.php
index 554d69cbed1901e96c8e92aa928fbaf6025a975b..a7177cefd317bc8412b9e2d877f1bcb3f333866e 100755
--- a/src/app/resource/controllers/SummarySheetController.php
+++ b/src/app/resource/controllers/SummarySheetController.php
@@ -231,7 +231,7 @@ class SummarySheetController
                     $initiator = EntityModel::getByEntityId(['entityId' => $resource['initiator'], 'select' => ['short_label']]);
                 }
                 $initiatorEntity = empty($initiator) ? '' : "({$initiator['short_label']})";
-                $typist          = UserModel::getLabelledUserById(['login' => $resource['typist']]);
+                $typist          = UserModel::getLabelledUserById(['id' => $resource['typist']]);
                 $doctype         = empty($resource['type_label']) ? '<i>'._UNDEFINED.'</i>' : "<b>{$resource['type_label']}</b>";
 
                 $pdf->SetY($pdf->GetY() + 40);
diff --git a/src/app/resource/models/ResModelAbstract.php b/src/app/resource/models/ResModelAbstract.php
index fe9f43ba08aa640f036a3508e6591bc7692900d7..b3f2e694180337f0659e91d51e9384104ef18fb5 100755
--- a/src/app/resource/models/ResModelAbstract.php
+++ b/src/app/resource/models/ResModelAbstract.php
@@ -83,8 +83,8 @@ abstract class ResModelAbstract
     public static function create(array $aArgs)
     {
         ValidatorModel::notEmpty($aArgs, ['format', 'typist', 'creation_date', 'docserver_id', 'path', 'filename', 'fingerprint', 'filesize', 'status', 'category_id']);
-        ValidatorModel::stringType($aArgs, ['format', 'typist', 'creation_date', 'docserver_id', 'path', 'filename', 'fingerprint', 'status', 'category_id']);
-        ValidatorModel::intVal($aArgs, ['filesize', 'res_id']);
+        ValidatorModel::stringType($aArgs, ['format', 'creation_date', 'docserver_id', 'path', 'filename', 'fingerprint', 'status', 'category_id']);
+        ValidatorModel::intVal($aArgs, ['filesize', 'res_id', 'typist']);
 
         if (empty($aArgs['res_id'])) {
             $aArgs['res_id'] = DatabaseModel::getNextSequenceValue(['sequenceId' => 'res_id_mlb_seq']);