diff --git a/web/components/Auth.ce.vue b/web/components/Auth.ce.vue
index 6acf9fdd2..4f8da6d16 100644
--- a/web/components/Auth.ce.vue
+++ b/web/components/Auth.ce.vue
@@ -26,7 +26,7 @@ const { authAction, stateData } = storeToRefs(serverStore);
         size="12px"
         :text="t(authAction.text)"
         :title="authAction?.title ? t(authAction?.title) : undefined"
-        @click="authAction.click()"
+        @click="authAction.click ? authAction.click() : undefined"
       />
     </span>
   </div>
diff --git a/web/components/KeyActions.vue b/web/components/KeyActions.vue
index 0925f06f6..76a6bb95a 100644
--- a/web/components/KeyActions.vue
+++ b/web/components/KeyActions.vue
@@ -50,7 +50,7 @@ const filteredKeyActions = computed((): ServerStateDataAction[] | undefined => {
         :icon-right-hover-display="true"
         :text="t(action.text)"
         :title="action.title ? t(action.title) : undefined"
-        @click="action.click()"
+        @click="action.click ? action.click() : undefined"
       />
     </li>
   </ul>
diff --git a/web/components/Registration.ce.vue b/web/components/Registration.ce.vue
index 230e21436..066f36df7 100644
--- a/web/components/Registration.ce.vue
+++ b/web/components/Registration.ce.vue
@@ -244,7 +244,7 @@ const items = computed((): RegistrationItemProps[] => {
               :icon="authAction.icon"
               :text="t(authAction.text)"
               :title="authAction.title ? t(authAction.title) : undefined"
-              @click="authAction.click()"
+              @click="authAction.click ? authAction.click() : undefined"
             />
           </span>
         </header>
diff --git a/web/components/Registration/KeyLinkedStatus.vue b/web/components/Registration/KeyLinkedStatus.vue
index 70e77016d..e1824c80e 100644
--- a/web/components/Registration/KeyLinkedStatus.vue
+++ b/web/components/Registration/KeyLinkedStatus.vue
@@ -36,7 +36,7 @@ defineProps<{
         :icon-right="ArrowPathIcon"
         size="16px"
       >
-        {{ t(keyLinkedOutput.text) }}
+        {{ t(keyLinkedOutput.text ?? 'Unknown') }}
       </UiBadge>
     </BrandButton>
     <UiBadge
@@ -45,7 +45,7 @@ defineProps<{
       :icon="keyLinkedOutput.icon"
       size="16px"
     >
-      {{ t(keyLinkedOutput.text) }}
+      {{ t(keyLinkedOutput.text ?? 'Unknown') }}
     </UiBadge>
 
     <span class="inline-flex flex-wrap-items-start gap-8px">
diff --git a/web/components/Registration/ReplaceCheck.vue b/web/components/Registration/ReplaceCheck.vue
index 295c891ec..4c279f55e 100644
--- a/web/components/Registration/ReplaceCheck.vue
+++ b/web/components/Registration/ReplaceCheck.vue
@@ -33,7 +33,7 @@ defineProps<{
       :icon="replaceStatusOutput.icon"
       size="16px"
     >
-      {{ t(replaceStatusOutput.text) }}
+      {{ t(replaceStatusOutput.text ?? 'Unknown') }}
     </UiBadge>
 
     <BrandButton
diff --git a/web/components/Registration/UpdateExpirationAction.vue b/web/components/Registration/UpdateExpirationAction.vue
index 480961bc5..3f7ec6e30 100644
--- a/web/components/Registration/UpdateExpirationAction.vue
+++ b/web/components/Registration/UpdateExpirationAction.vue
@@ -76,7 +76,7 @@ const output = computed(() => {
         :text="t('Extend License')"
         :title="t('Pay your annual fee to continue receiving OS updates.')"
         class="flex-grow"
-        @click="renewAction.click()"
+        @click="renewAction.click ? renewAction.click() : undefined"
       />
 
       <BrandButton
diff --git a/web/components/UpdateOs/CheckUpdateResponseModal.vue b/web/components/UpdateOs/CheckUpdateResponseModal.vue
index d6c9eb864..784a2011c 100644
--- a/web/components/UpdateOs/CheckUpdateResponseModal.vue
+++ b/web/components/UpdateOs/CheckUpdateResponseModal.vue
@@ -254,7 +254,7 @@ const modalWidth = computed(() => {
             :icon="item.icon"
             :icon-right="item.iconRight"
             :icon-right-hover-display="item.iconRightHoverDisplay"
-            :text="t(item.text)"
+            :text="t(item.text ?? '')"
             :title="item.title ? t(item.title) : undefined"
             @click="item.click ? item.click() : undefined"
           />
@@ -324,7 +324,7 @@ const modalWidth = computed(() => {
             :icon="item.icon"
             :icon-right="item.iconRight"
             :icon-right-hover-display="item.iconRightHoverDisplay"
-            :text="t(item.text)"
+            :text="t(item.text ?? '')"
             :title="item.title ? t(item.title) : undefined"
             @click="item.click ? item.click() : undefined"
           />
diff --git a/web/components/UpdateOs/UpdateIneligible.vue b/web/components/UpdateOs/UpdateIneligible.vue
index 0be124059..4af810265 100644
--- a/web/components/UpdateOs/UpdateIneligible.vue
+++ b/web/components/UpdateOs/UpdateIneligible.vue
@@ -95,7 +95,7 @@ watchEffect(() => {
           :text="t('Extend License')"
           :title="t('Pay your annual fee to continue receiving OS updates.')"
           class="flex-grow"
-          @click="renewAction.click()"
+          @click="renewAction.click ? renewAction.click() : undefined"
         />
         <!-- <BrandButton
           btn-style="black"
diff --git a/web/components/UserProfile/DropdownItem.vue b/web/components/UserProfile/DropdownItem.vue
index d80ec046a..d5026534d 100644
--- a/web/components/UserProfile/DropdownItem.vue
+++ b/web/components/UserProfile/DropdownItem.vue
@@ -34,11 +34,11 @@ const showExternalIconOnHover = computed(() => props.item?.external && props.ite
       'rounded-md': rounded,
       'disabled:opacity-50 disabled:hover:opacity-50 disabled:focus:opacity-50 disabled:cursor-not-allowed': item?.disabled,
     }"
-    @click.stop="item?.click ? item?.click(item?.clickParams) : null"
+    @click.stop="item?.click ? item?.click(item?.clickParams ?? []) : null"
   >
     <span class="leading-snug inline-flex flex-row items-center gap-x-8px">
       <component :is="item?.icon" class="flex-shrink-0 text-current w-16px h-16px" aria-hidden="true" />
-      {{ t(item?.text, item?.textParams) }}
+      {{ t(item?.text, item?.textParams ?? []) }}
     </span>
     <ArrowTopRightOnSquareIcon
       v-if="showExternalIconOnHover"
diff --git a/web/components/UserProfile/DropdownLaunchpad.vue b/web/components/UserProfile/DropdownLaunchpad.vue
index fec78ef53..18d04703c 100644
--- a/web/components/UserProfile/DropdownLaunchpad.vue
+++ b/web/components/UserProfile/DropdownLaunchpad.vue
@@ -41,7 +41,7 @@ const showExpireTime = computed(() => (state.value === 'TRIAL' || state.value ==
             :icon="unraidApiStatus === 'restarting' ? BrandLoadingWhite : unraidApiRestartAction?.icon"
             :text="unraidApiStatus === 'restarting' ? t('Restarting unraid-api…') : t('Restart unraid-api')"
             :title="unraidApiStatus === 'restarting' ? t('Restarting unraid-api…') : t('Restart unraid-api')"
-            @click="unraidApiRestartAction?.click()"
+            @click="unraidApiRestartAction?.click ? unraidApiRestartAction?.click() : undefined"
           />
         </li>
       </ul>
diff --git a/web/components/UserProfile/ServerState.vue b/web/components/UserProfile/ServerState.vue
index 729547e83..82638eaeb 100644
--- a/web/components/UserProfile/ServerState.vue
+++ b/web/components/UserProfile/ServerState.vue
@@ -23,7 +23,7 @@ const upgradeAction = computed((): ServerStateDataAction | undefined => {
       <UpcServerStateBuy
         class="text-gamma"
         :title="t('Upgrade Key')"
-        @click="upgradeAction.click()"
+        @click="upgradeAction.click ? upgradeAction.click() : undefined"
       >
         <h5>Unraid OS <em><strong>{{ t(stateData.humanReadable) }}</strong></em></h5>
       </UpcServerStateBuy>
@@ -36,7 +36,7 @@ const upgradeAction = computed((): ServerStateDataAction | undefined => {
       <UpcServerStateBuy
         class="text-orange-dark relative top-[1px] hidden sm:block"
         :title="t('Purchase Key')"
-        @click="purchaseAction.click()"
+        @click="purchaseAction.click ? purchaseAction.click() : undefined"
       >{{ t('Purchase') }}</UpcServerStateBuy>
     </template>
   </span>
diff --git a/web/types/userProfile.ts b/web/types/userProfile.ts
index efa04fe3b..eafec8e55 100644
--- a/web/types/userProfile.ts
+++ b/web/types/userProfile.ts
@@ -1,8 +1,14 @@
 import type { ArrowTopRightOnSquareIcon } from '@heroicons/vue/24/solid';
 
+// type the click key in the UserProfileLink interface to allow for optional params
+// the click key can be a function that returns void or a promise that returns void
+
+export type UserProfileLinkClickParams = string[] | number[] | undefined;
+export type UserProfileLinkClick = ((...args: UserProfileLinkClickParams[]) => void | Promise<void>) | ((...args: UserProfileLinkClickParams[]) => Promise<NodeJS.Timeout | undefined>);
+
 export interface UserProfileLink {
-  click?: () => void | Promise<void>;
-  clickParams?: string[] | number[];
+  click?: UserProfileLinkClick;
+  clickParams?: UserProfileLinkClickParams;
   disabled?: boolean;
   emphasize?: boolean;
   external?: boolean;