diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStepSignature.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStepSignature.php
index 527ede0ef..7f6c5cdda 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStepSignature.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStepSignature.php
@@ -140,4 +140,16 @@ class EntityWorkflowStepSignature implements TrackCreationInterface, TrackUpdate
     {
         return EntityWorkflowSignatureStateEnum::SIGNED == $this->getState();
     }
+
+    /**
+     * @return 'person'|'user'
+     */
+    public function getSignerKind(): string
+    {
+        if ($this->personSigner instanceof Person) {
+            return 'person';
+        }
+
+        return 'user';
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig
index 68b6f4274..50172089c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig
@@ -4,12 +4,20 @@
     {% for s in signatures %}
         <div class="row row-hover align-items-center">
                 <div class="col-sm-12 col-md-8">
-                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                        action: 'show', displayBadge: true,
-                        targetEntity: { name: 'person', id: s.signer.id },
-                        buttonText: s.signer|chill_entity_render_string,
-                        isDead: s.signer.deathDate is not null
-                    } %}
+                    {% if s.signerKind == 'person' %}
+                        {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                            action: 'show', displayBadge: true,
+                            targetEntity: { name: 'person', id: s.signer.id },
+                            buttonText: s.signer|chill_entity_render_string,
+                            isDead: s.signer.deathDate is not null
+                        } %}
+                    {% else %}
+                        {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                            action: 'show', displayBadge: true,
+                            targetEntity: { name: 'user', id: s.signer.id },
+                            buttonText: s.signer|chill_entity_render_string,
+                        } %}
+                    {% endif %}
                 </div>
                 <div class="col-sm-12 col-md-4">
                         {% if s.isSigned %}