diff --git a/extend.php b/extend.php
index 475b884..2a461bf 100644
--- a/extend.php
+++ b/extend.php
@@ -47,12 +47,9 @@
         ->add(RegisterMiddleware::class),
 
     (new Extend\Model(User::class))
-        ->relationship('fofTermsPolicies', function (AbstractModel $user): BelongsToMany {
-            return $user->belongsToMany(Policy::class, 'fof_terms_policy_user')->withPivot('accepted_at');
-        })
-        ->relationship('fofTermsPoliciesState', function (AbstractModel $user): BelongsToMany {
-            return $user->belongsToMany(Policy::class, 'fof_terms_policy_user')->withPivot('is_accepted');
-        }),
+        ->relationship('fofTermsPolicies', fn (AbstractModel $user): BelongsToMany => $user
+                ->belongsToMany(Policy::class, 'fof_terms_policy_user')
+                ->withPivot(['accepted_at', 'is_accepted'])),
 
     (new Extend\User())
         ->permissionGroups(function ($actor, $groupIds) {
diff --git a/js/src/@types/Model/User.d.ts b/js/src/@types/Model/User.d.ts
new file mode 100644
index 0000000..a9b11cc
--- /dev/null
+++ b/js/src/@types/Model/User.d.ts
@@ -0,0 +1,17 @@
+export * from 'flarum/common/models/User';
+
+declare module 'flarum/common/models/User' {
+  export default interface User {
+    fofTermsPoliciesHasUpdate(): boolean;
+    fofTermsPoliciesMustAccept(): boolean;
+    fofTermsPoliciesState(): Record<
+      number,
+      {
+        accepted_at: string;
+        has_update: boolean;
+        is_accepted: boolean;
+        must_accept: boolean;
+      }
+    >;
+  }
+}
diff --git a/js/src/common/models/Policy.js b/js/src/common/models/Policy.ts
similarity index 54%
rename from js/src/common/models/Policy.js
rename to js/src/common/models/Policy.ts
index 88a54de..32f8943 100644
--- a/js/src/common/models/Policy.js
+++ b/js/src/common/models/Policy.ts
@@ -2,12 +2,12 @@ import Model from 'flarum/common/Model';
 import computed from 'flarum/common/utils/computed';
 
 export default class Policy extends Model {
-  sort = Model.attribute('sort');
-  name = Model.attribute('name');
-  url = Model.attribute('url');
-  update_message = Model.attribute('update_message');
-  terms_updated_at = Model.attribute('terms_updated_at');
-  optional = Model.attribute('optional');
+  sort = Model.attribute<string>('sort');
+  name = Model.attribute<string>('name');
+  url = Model.attribute<string>('url');
+  update_message = Model.attribute<string>('update_message');
+  terms_updated_at = Model.attribute<string>('terms_updated_at');
+  optional = Model.attribute<boolean>('optional');
   additional_info = Model.attribute('additional_info');
   form_key = computed('id', (id) => 'fof_terms_policy_' + id);
 
diff --git a/js/src/forum/components/AcceptPoliciesModal.js b/js/src/forum/components/AcceptPoliciesModal.js
index b7ebc5c..2b59660 100644
--- a/js/src/forum/components/AcceptPoliciesModal.js
+++ b/js/src/forum/components/AcceptPoliciesModal.js
@@ -10,7 +10,9 @@ export default class AcceptPoliciesModal extends Modal {
     super.oninit(vnode);
 
     app.store.all('fof-terms-policies').forEach((policy) => {
-      this[policy.form_key()] = false;
+      const state = app.session.user.fofTermsPoliciesState()[policy.id()];
+      // For optional policies, maintain current acceptance status
+      this[policy.form_key()] = policy.optional() ? state?.is_accepted || false : false;
     });
   }
 
@@ -23,7 +25,7 @@ export default class AcceptPoliciesModal extends Modal {
   }
 
   content() {
-    return m('.Modal-body', this.body());
+    return <div className="Modal-body">{this.body()}</div>;
   }
 
   body() {
@@ -36,91 +38,83 @@ export default class AcceptPoliciesModal extends Modal {
     );
 
     if (policies.length === 0) {
-      return Button.component(
-        {
-          className: 'Button',
-          onclick() {
+      return (
+        <Button
+          className="Button"
+          onclick={() => {
             app.modal.close();
-          },
-        },
-        app.translator.trans('fof-terms.forum.accept-modal.close')
+          }}
+        >
+          {app.translator.trans('fof-terms.forum.accept-modal.close')}
+        </Button>
       );
     }
 
-    return policies.map((policy) =>
-      m('div', [
-        m('h2', policy.name()),
-        app.forum.attribute('fof-terms.hide-updated-at')
-          ? null
-          : m(
-              'p',
-              policy.terms_updated_at()
-                ? app.translator.trans('fof-terms.forum.accept-modal.updated-at', {
-                    date: dayjs(policy.terms_updated_at()).format(app.forum.attribute('fof-terms.date-format')),
-                  })
-                : app.translator.trans('fof-terms.forum.accept-modal.updated-recently')
-            ),
-        policy.update_message() ? m('p', policy.update_message()) : null,
-        m(
-          '.Form-group',
-          m(
-            '.FoF-Terms-Check.FoF-Terms-Check--login',
-            m('label.checkbox', [
-              m('input', {
-                type: 'checkbox',
-                checked: this[policy.form_key()],
-                onchange: () => {
+    return policies.map((policy) => (
+      <div>
+        <h2>{policy.name()}</h2>
+        {app.forum.attribute('fof-terms.hide-updated-at') ? null : (
+          <p>
+            {policy.terms_updated_at()
+              ? app.translator.trans('fof-terms.forum.accept-modal.updated-at', {
+                  date: dayjs(policy.terms_updated_at()).format(app.forum.attribute('fof-terms.date-format')),
+                })
+              : app.translator.trans('fof-terms.forum.accept-modal.updated-recently')}
+          </p>
+        )}
+        {policy.update_message() ? <p>{policy.update_message()}</p> : null}
+        <div className="Form-group">
+          <div className="FoF-Terms-Check FoF-Terms-Check--login">
+            <label className="checkbox">
+              <input
+                type="checkbox"
+                checked={this[policy.form_key()]}
+                onchange={() => {
                   this[policy.form_key()] = !this[policy.form_key()];
-                },
-              }),
-              app.translator.trans('fof-terms.forum.accept-modal.i-accept', {
+                }}
+              />
+              {app.translator.trans('fof-terms.forum.accept-modal.i-accept', {
                 policy: policy.name(),
-                a: policy.url()
-                  ? m('a', {
-                      href: policy.url(),
-                      target: '_blank',
-                    })
-                  : m('span'),
-              }),
-            ])
-          )
-        ),
-        Button.component(
-          {
-            className: 'Button Button--primary',
-            disabled: !this[policy.form_key()] && !policy.optional(),
-            onclick: () => {
-              // We need to save the "must accept" property before performing the request
-              // Because an updated user serializer will be returned
-              const hadToAcceptToInteract = app.session.user.fofTermsPoliciesMustAccept();
+                a: policy.url() ? <a href={policy.url()} target="_blank" /> : <span />,
+              })}
+            </label>
+          </div>
+        </div>
+        <Button
+          className="Button Button--primary"
+          disabled={!this[policy.form_key()] && !policy.optional()}
+          onclick={() => {
+            // We need to save the "must accept" property before performing the request
+            // Because an updated user serializer will be returned
+            const hadToAcceptToInteract = app.session.user.fofTermsPoliciesMustAccept();
 
-              app
-                .request({
-                  url: app.forum.attribute('apiUrl') + policy.apiEndpoint() + (this[policy.form_key()] ? '/accept' : '/decline'),
-                  method: 'POST',
-                  errorHandler: this.onerror.bind(this),
-                })
-                .then((updated) => {
-                  app.store.pushPayload(updated);
+            app
+              .request({
+                url: app.forum.attribute('apiUrl') + policy.apiEndpoint() + (this[policy.form_key()] ? '/accept' : '/decline'),
+                method: 'POST',
+                errorHandler: this.onerror.bind(this),
+              })
+              .then((updated) => {
+                app.store.pushPayload(updated);
 
-                  // If this was the last policy to accept, close the modal
-                  if (policies.length === 1) {
-                    if (hadToAcceptToInteract) {
-                      // If the user was previously not allowed to interact with the forum,
-                      // we refresh to get updated permissions in the frontend
-                      window.location.reload();
-                    } else {
-                      app.modal.close();
-                    }
+                // If this was the last policy to accept, close the modal
+                if (policies.length === 1) {
+                  if (hadToAcceptToInteract) {
+                    // If the user was previously not allowed to interact with the forum,
+                    // we refresh to get updated permissions in the frontend
+                    window.location.reload();
+                  } else {
+                    app.modal.close();
                   }
+                }
 
-                  m.redraw();
-                });
-            },
-          },
-          app.translator.trans('fof-terms.forum.accept-modal.accept')
-        ),
-      ])
-    );
+                m.redraw();
+              });
+          }}
+        >
+          {app.translator.trans('fof-terms.forum.accept-modal.accept')}
+        </Button>
+      </div>
+    ));
   }
 }
diff --git a/js/src/forum/components/UpdateAlert.js b/js/src/forum/components/UpdateAlert.js
deleted file mode 100644
index b241c06..0000000
--- a/js/src/forum/components/UpdateAlert.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import app from 'flarum/forum/app';
-import Button from 'flarum/common/components/Button';
-import listItems from 'flarum/common/helpers/listItems';
-import AcceptPoliciesModal from './AcceptPoliciesModal';
-
-/* global m */
-
-let temporarilyHidden = false;
-
-/**
- * Renders similarly to Flarum's Alert, but with an additional .container inside
- */
-export default class UpdateAlert {
-  shouldShowAlert() {
-    if (temporarilyHidden) {
-      return false;
-    }
-
-    const user = app.session.user;
-
-    return user && user.fofTermsPoliciesHasUpdate();
-  }
-
-  view() {
-    if (!this.shouldShowAlert()) {
-      return m('div');
-    }
-
-    const controls = [
-      Button.component(
-        {
-          className: 'Button Button--link',
-          onclick: () => {
-            app.modal.show(AcceptPoliciesModal);
-          },
-        },
-        app.translator.trans('fof-terms.forum.update-alert.review')
-      ),
-    ];
-
-    const dismissControl = [];
-
-    if (!app.session.user.fofTermsPoliciesMustAccept()) {
-      dismissControl.push(
-        Button.component({
-          icon: 'fas fa-times',
-          className: 'Button Button--link Button--icon Alert-dismiss',
-          onclick: () => {
-            temporarilyHidden = true;
-          },
-        })
-      );
-    }
-
-    return m(
-      '.Alert.Alert-info',
-      m('.container', [
-        m(
-          'span.Alert-body',
-          app.session.user.fofTermsPoliciesMustAccept()
-            ? app.translator.trans('fof-terms.forum.update-alert.must-accept-message')
-            : app.translator.trans('fof-terms.forum.update-alert.can-accept-message')
-        ),
-        m('ul.Alert-controls', listItems(controls.concat(dismissControl))),
-      ])
-    );
-  }
-}
diff --git a/js/src/forum/components/UpdateAlert.tsx b/js/src/forum/components/UpdateAlert.tsx
new file mode 100644
index 0000000..1a2e648
--- /dev/null
+++ b/js/src/forum/components/UpdateAlert.tsx
@@ -0,0 +1,75 @@
+import app from 'flarum/forum/app';
+import Button from 'flarum/common/components/Button';
+import listItems from 'flarum/common/helpers/listItems';
+import AcceptPoliciesModal from './AcceptPoliciesModal';
+
+let temporarilyHidden = false;
+
+/**
+ * Renders similarly to Flarum's Alert, but with an additional .container inside
+ */
+export default class UpdateAlert {
+  shouldShowAlert() {
+    if (temporarilyHidden) {
+      return false;
+    }
+
+    const { user } = app.session;
+
+    return user && user.fofTermsPoliciesHasUpdate();
+  }
+
+  hasOnlyOptionalUpdates() {
+    const { user } = app.session;
+    return user && !user.fofTermsPoliciesMustAccept() && user.fofTermsPoliciesHasUpdate();
+  }
+
+  view() {
+    const { user } = app.session;
+
+    if (!this.shouldShowAlert() || !user) {
+      return null;
+    }
+
+    const controls = [
+      <Button
+        className="Button Button--link"
+        onclick={() => {
+          app.modal.show(AcceptPoliciesModal);
+        }}
+      >
+        {app.translator.trans('fof-terms.forum.update-alert.review')}
+      </Button>,
+    ];
+
+    const dismissControl = [];
+
+    if (!user.fofTermsPoliciesMustAccept()) {
+      dismissControl.push(
+        <Button
+          icon="fas fa-times"
+          className="Button Button--link Button--icon Alert-dismiss"
+          onclick={() => {
+            temporarilyHidden = true;
+          }}
+          aria-label={app.translator.trans('fof-terms.forum.update-alert.close')}
+        />
+      );
+    }
+
+    return (
+      <div className="Alert Alert-info">
+        <div className="container">
+          <span className="Alert-body">
+            {this.hasOnlyOptionalUpdates()
+              ? app.translator.trans('fof-terms.forum.update-alert.can-accept-optional-message')
+              : user.fofTermsPoliciesMustAccept()
+                ? app.translator.trans('fof-terms.forum.update-alert.must-accept-message')
+                : app.translator.trans('fof-terms.forum.update-alert.can-accept-message')}
+          </span>
+          <ul className="Alert-controls">{listItems(controls.concat(dismissControl))}</ul>
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/js/src/forum/components/addManagePoliciesOption.js b/js/src/forum/components/addManagePoliciesOption.js
index 348547e..f3e0cf7 100644
--- a/js/src/forum/components/addManagePoliciesOption.js
+++ b/js/src/forum/components/addManagePoliciesOption.js
@@ -25,11 +25,11 @@ export default function () {
 
     items.add(
       'policies',
-      <FieldSet label={'Policies'}>
+      <FieldSet label={app.translator.trans('fof-terms.forum.user_settings.optional_policies_label')}>
         {optionalPolicies.map((policy) => {
           const { is_accepted } = policyState[policy.id()];
           return (
-            <div class={'Fof-Terms-Policy-User-Settings-Management'}>
+            <div class="Fof-Terms-Policy-User-Settings-Management">
               <Switch
                 state={is_accepted}
                 onchange={async (value) => {
@@ -52,7 +52,7 @@ export default function () {
           );
         })}
       </FieldSet>,
-      -200
+      -99
     );
   });
 }
diff --git a/resources/locale/en.yml b/resources/locale/en.yml
index 1d07b01..5f7dcd4 100644
--- a/resources/locale/en.yml
+++ b/resources/locale/en.yml
@@ -72,7 +72,12 @@ fof-terms:
         update-alert:
             must-accept-message: We've temporarily restricted access to your account while you check out the new terms.
             can-accept-message: We recently updated the terms. You must accept them to continue using this website.
+            can-accept-optional-message: We recently updated the terms. You can review them at your convenience.
             review: Click here to review and accept the new terms
+            close: Close
+
+        user_settings:
+            optional_policies_label: Policies
 
         user_controls:
             state_button: Terms accept state
diff --git a/src/Repositories/PolicyRepository.php b/src/Repositories/PolicyRepository.php
index dbb452f..224beb9 100644
--- a/src/Repositories/PolicyRepository.php
+++ b/src/Repositories/PolicyRepository.php
@@ -12,7 +12,6 @@
 namespace FoF\Terms\Repositories;
 
 use Carbon\Carbon;
-use DateTime;
 use Flarum\User\User;
 use FoF\Terms\Events\Created;
 use FoF\Terms\Events\Deleted;
@@ -27,14 +26,11 @@
 
 class PolicyRepository
 {
-    protected $policy;
-    protected $validator;
-    protected $cache;
+    protected Policy $policy;
+    protected PolicyValidator $validator;
+    protected Repository $cache;
 
-    /**
-     * @var Dispatcher
-     */
-    protected $events;
+    protected Dispatcher $events;
 
     protected $rememberState;
 
@@ -49,7 +45,7 @@ public function __construct(Policy $policy, PolicyValidator $validator, Reposito
     }
 
     /**
-     * @return Policy[]|Collection
+     * @return Collection<Policy>
      */
     public function all(): Collection
     {
@@ -63,13 +59,9 @@ public function clearCache()
         $this->cache->forget(self::CACHE_KEY);
     }
 
-    /**
-     * @param string $id
-     *
-     * @return Policy
-     */
     public function findOrFail(string $id): Policy
     {
+        /** @phpstan-ignore-next-line Method FoF\Terms\Repositories\PolicyRepository::findOrFail() should return FoF\Terms\Policy but returns Illuminate\Database\Eloquent\Model. */
         return $this->policy->newQuery()->findOrFail($id);
     }
 
@@ -77,7 +69,7 @@ public function state(User $user)
     {
         if (!$this->rememberState) {
             /**
-             * @var Collection $userPolicies
+             * @var Collection<Policy> $userPolicies
              *
              * @phpstan-ignore-next-line
              */
@@ -86,20 +78,19 @@ public function state(User $user)
             $this->rememberState = [];
 
             foreach ($this->all() as $policy) {
+                /** @phpstan-ignore-next-line Access to an undefined property FoF\Terms\Policy::$pivot */
                 $accepted_at = $userPolicies->has($policy->id) ? Carbon::parse($userPolicies->get($policy->id)->pivot->accepted_at) : null;
                 $has_update = !$accepted_at || (($policy->terms_updated_at !== null) && $policy->terms_updated_at->gt($accepted_at));
                 $optional = $policy->optional;
-
                 /**
                  * @var bool $is_accepted
                  *
-                 * @phpstan-ignore-next-line
+                 * @phpstan-ignore-next-line Access to an undefined property FoF\Terms\Policy::$pivot
                  */
-                $is_accepted = $user->fofTermsPoliciesState->keyBy('id')->get($policy->id)->pivot->is_accepted;
+                $is_accepted = $userPolicies->has($policy->id) ? $userPolicies->get($policy->id)->pivot->is_accepted : false;
 
                 $this->rememberState[$policy->id] = [
-                    // Same format as Flarum is using for the serializer responses
-                    'accepted_at' => $accepted_at ? $accepted_at->format(DateTime::RFC3339) : null,
+                    'accepted_at' => $accepted_at ? $accepted_at->toRfc3339String() : null,
                     'has_update'  => $has_update,
                     'must_accept' => $has_update && !$user->can('postponeAccept', $policy) && !$optional,
                     'is_accepted' => $is_accepted,