diff --git a/src/app/resource/controllers/ResourceListController.php b/src/app/resource/controllers/ResourceListController.php
index a57ee27cb500a777670395f23cc103c28086d789..851c9a7e31beae7a1e54a4943f66be0430c57213 100644
--- a/src/app/resource/controllers/ResourceListController.php
+++ b/src/app/resource/controllers/ResourceListController.php
@@ -952,7 +952,13 @@ class ResourceListController
                     } elseif ($value['value'] == 'getRegisteredMailRecipient') {
                         if (!empty($registeredMail)) {
                             $recipient = json_decode($registeredMail['recipient'], true);
-                            $recipient = $recipient['company'] . ' ' . $recipient['firstname'] . ' ' . $recipient['lastname'];
+                            if (!empty($recipient['company']) && (!empty($recipient['firstname']) || !empty($recipient['lastname']))) {
+                                $recipient = $recipient['firstname'] . ' ' . $recipient['lastname'] . ' (' . $recipient['company'] . ')';
+                            } elseif (empty($recipient['company']) && (!empty($recipient['firstname']) || !empty($recipient['lastname']))) {
+                                $recipient = $recipient['firstname'] . ' ' . $recipient['lastname'];
+                            } elseif (!empty($recipient['company']) && empty($recipient['firstname']) && empty($recipient['lastname'])) {
+                                $recipient = $recipient['company'];
+                            }
                             $value['displayValue'] = $recipient;
                         } else {
                             $value['displayValue'] = '';