diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
index 75ca87955c..189a2687c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
@@ -75,6 +75,7 @@
     var extendedPatronAttributes = "[% Koha.Preference('ExtendedPatronAttributes') | html %]";
     var loggedInLibrary = '[% Branches.GetLoggedInBranchcode | html %]';
     var singleBranchMode = '[% singleBranchMode | html %]';
+    var showPatronFirstnameIfDifferentThanPreferredname = [% Koha.Preference('ShowPatronFirstnameIfDifferentThanPreferredname') ? 1 : 0 | html %];
 </script>
 [% IF ( PatronAutoComplete ) %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 384cf72157..97226c5db8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -594,9 +594,10 @@
                                         let patron_id = encodeURIComponent(row.patron_id);
                                         let r = '';
                                         [% IF ! open_on_row_click %]
-                                        r += "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=" + patron_id + "\" class=\"patron_name\" data-borrowernumber=\"" + patron_id + "\" style=\"white-space:nowrap\">" + $patron_to_html(row, { invert_name: 1 }) + "</a>";
+                                        r += "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=" + patron_id + "\" class=\"patron_name\" data-borrowernumber=\"" + patron_id + "\" style=\"white-space:nowrap\">"
+                                            + $patron_to_html(row, { invert_name: 1, showDiffFirstname: [% Koha.Preference('ShowPatronFirstnameIfDifferentThanPreferredname') ? 1 : 0 | html %] }) + "</a>";
                                         [% ELSE %]
-                                        r += $patron_to_html(row, { invert_name: 1 });
+                                        r += $patron_to_html(row, { invert_name: 1, showDiffFirstname: [% Koha.Preference('ShowPatronFirstnameIfDifferentThanPreferredname') ? 1 : 0 | html %] });
                                         [% END %]
                                         r += '<br/>';
                                         r += '<div class="address"><ul>';
diff --git a/koha-tmpl/intranet-tmpl/prog/js/patron-format.js b/koha-tmpl/intranet-tmpl/prog/js/patron-format.js
index e82baa3745..cec9c0dbeb 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/patron-format.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/patron-format.js
@@ -3,7 +3,8 @@
      * Format the patron response from a Koha RESTful API request.
      * @param  {Object}  patron  The patron json object as returned from the Koha RESTful API
      * @param  {Object}  config  A configuration object
-     *                           Valid keys are: `invert_name`, `display_cardnumber` and `url`
+     *                           Valid keys are: `invert_name`, `display_cardnumber', `url`
+     *                           and `showDiffFirstname`
      * @return {string}          The formatted HTML string
      */
     window.$patron_to_html = function (patron, config) {
@@ -33,6 +34,15 @@
             preferred_name += " (" + escape_str(patron.other_name) + ")";
         }
 
+        if (
+            config &&
+            config.showDiffFirstname &&
+            patron.preferred_name != patron.firstname
+        ) {
+            preferred_name +=
+                " <em>[" + escape_str(patron.firstname) + "]</em>";
+        }
+
         const nameParts = [];
         if (config?.invert_name) {
             // Invert: "Surname, Preferred"
diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
index 551002f930..01e71e5b9c 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
@@ -803,6 +803,8 @@ function patron_autocomplete(node, options) {
                     $patron_to_html(item, {
                         display_cardnumber: true,
                         invert_name: true,
+                        showDiffFirstname:
+                            showPatronFirstnameIfDifferentThanPreferredname,
                     }) +
                     " " +
                     (item.date_of_birth