diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 6a296dd8ff..b5e0beee4e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -942,6 +942,7 @@
                                                                 data-pwd-length="[% category.effective_min_password_length | html %]"
                                                                 data-pwd-strong="[% category.effective_require_strong_password | html %]"
                                                                 data-typename="[% category_type | html %]"
+                                                                data-expiry-date="[% category.get_expiry_date | html %]"
                                                                 >[% category.description | html %]</option
                                                             >
                                                         [% ELSE %]
@@ -950,6 +951,7 @@
                                                                 data-pwd-length="[% category.effective_min_password_length | html %]"
                                                                 data-pwd-strong="[% category.effective_require_strong_password | html %]"
                                                                 data-typename="[% category_type | html %]"
+                                                                data-expiry-date="[% category.get_expiry_date | html %]"
                                                                 >[% category.description | html %]</option
                                                             >
                                                         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/members.js b/koha-tmpl/intranet-tmpl/prog/js/members.js
index a20561cfe0..55cffbc504 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/members.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/members.js
@@ -88,6 +88,17 @@ function update_category_code(category_code) {
     );
     var hint_string = __("Minimum password length: %s").format(min_length);
     hint.html(hint_string);
+
+    // Change patron's expiration date
+    $('#categorycode_entry').change(function() {
+        var fp = $("#to").flatpickr();
+        var expiryDate = $('select'+category_selector+' option:selected').data('expiryDate');
+        // Check if expiryDate is available and format it to YYYY-MM-DD
+        if (expiryDate) {
+            var formattedDate = expiryDate.split('T')[0];
+            fp.setDate(formattedDate);
+        }
+    });
 }
 
 function select_user(borrowernumber, borrower, relationship) {