diff --git a/src/settings/PatronNotices/TokensList/TokensList.js b/src/settings/PatronNotices/TokensList/TokensList.js
index d2bb42f2b..debc43916 100644
--- a/src/settings/PatronNotices/TokensList/TokensList.js
+++ b/src/settings/PatronNotices/TokensList/TokensList.js
@@ -28,12 +28,6 @@ class TokensList extends React.Component {
       label: <FormattedMessage id="ui-circulation.settings.patronNotices.multipleLoans" />,
       tag: 'loans',
     };
-
-    this.feeFineActionLoopConfig = {
-      enabled: true,
-      label: <FormattedMessage id="ui-circulation.settings.patronNotices.multipleFeeFineActions" />,
-      tag: 'feeActions',
-    };
   }
 
   render() {
@@ -121,7 +115,6 @@ class TokensList extends React.Component {
                 selectedCategory={selectedCategory}
                 header={<FormattedMessage id="ui-circulation.settings.patronNotices.feeFineChargeTokenHeader" />}
                 tokens={tokens.feeFineCharge}
-                onLoopSelect={onLoopSelect}
                 onSectionInit={onSectionInit}
                 onTokenSelect={onTokenSelect}
               />
@@ -134,8 +127,6 @@ class TokensList extends React.Component {
                 selectedCategory={selectedCategory}
                 header={<FormattedMessage id="ui-circulation.settings.patronNotices.feeFineActionTokenHeader" />}
                 tokens={tokens.feeFineAction}
-                loopConfig={this.feeFineActionLoopConfig}
-                onLoopSelect={onLoopSelect}
                 onSectionInit={onSectionInit}
                 onTokenSelect={onTokenSelect}
               />
diff --git a/src/settings/PatronNotices/tokens.js b/src/settings/PatronNotices/tokens.js
index 846c2c888..c279d893d 100644
--- a/src/settings/PatronNotices/tokens.js
+++ b/src/settings/PatronNotices/tokens.js
@@ -290,7 +290,7 @@ const formats = {
       ],
     },
     {
-      token: 'feeCharge.date',
+      token: 'feeCharge.chargeDate',
       previewValue: 'Jun 30, 2020',
       allowedFor: [
         patronNoticeCategoryIds.FEE_FINE_CHARGE,
@@ -299,7 +299,7 @@ const formats = {
       ],
     },
     {
-      token: 'feeCharge.dateTime',
+      token: 'feeCharge.chargeDateTime',
       previewValue: 'Jun 30, 2020 11:00',
       allowedFor: [
         patronNoticeCategoryIds.FEE_FINE_CHARGE,
@@ -330,7 +330,6 @@ const formats = {
       previewValue: 'This is a text field intended to provide additional information for the patron regarding the fee/fine.',
       allowedFor: [
         patronNoticeCategoryIds.FEE_FINE_CHARGE,
-        patronNoticeCategoryIds.AUTOMATED_FEE_FINE,
         patronNoticeCategoryIds.FEE_FINE_ACTION,
       ],
     },
@@ -342,12 +341,12 @@ const formats = {
       allowedFor: [patronNoticeCategoryIds.FEE_FINE_ACTION],
     },
     {
-      token: 'feeAction.date',
+      token: 'feeAction.actionDate',
       previewValue: 'Jul 10, 2020',
       allowedFor: [patronNoticeCategoryIds.FEE_FINE_ACTION],
     },
     {
-      token: 'feeAction.dateTime',
+      token: 'feeAction.actionDateTime',
       previewValue: 'Jul 10, 2020 8:00',
       allowedFor: [patronNoticeCategoryIds.FEE_FINE_ACTION],
     },