diff --git a/website/client/src/components/avatar.vue b/website/client/src/components/avatar.vue
index 528fe199ac..b0094e6549 100644
--- a/website/client/src/components/avatar.vue
+++ b/website/client/src/components/avatar.vue
@@ -321,8 +321,8 @@ export default {
       return null;
     },
     petClass () {
-      const foolEvent = this.currentEventList?.find(event => moment()
-        .isBetween(event.start, event.end) && event.aprilFools);
+      const foolEvent = this.currentEventList?.find(event => event.aprilFools && moment()
+        .isBetween(event.start, event.end));
       if (foolEvent) {
         return this.foolPet(this.member.items.currentPet, foolEvent.aprilFools);
       }
diff --git a/website/client/src/components/tasks/column.vue b/website/client/src/components/tasks/column.vue
index b12121e1a8..a54c07b58f 100644
--- a/website/client/src/components/tasks/column.vue
+++ b/website/client/src/components/tasks/column.vue
@@ -86,8 +86,8 @@
         v-if="taskList.length > 0"
         ref="tasksList"
         class="sortable-tasks"
-        :options="{disabled: activeFilter.label === 'scheduled' || !canBeDragged(),
-                   scrollSensitivity: 64}"
+        :disabled="activeFilter.label === 'scheduled' || !canBeDragged()"
+        scrollSensitivity="64"
         :delay-on-touch-only="true"
         :delay="100"
         @update="taskSorted"
diff --git a/website/client/src/components/tasks/modal-controls/checklist.vue b/website/client/src/components/tasks/modal-controls/checklist.vue
index 6680414635..a82a6c9a63 100644
--- a/website/client/src/components/tasks/modal-controls/checklist.vue
+++ b/website/client/src/components/tasks/modal-controls/checklist.vue
@@ -21,11 +21,9 @@
     >
       <draggable
         v-model="checklist"
-        :options="{
-          handle: '.grippy',
-          filter: '.task-dropdown',
-          disabled: disabled,
-        }"
+        handle=".grippy"
+        filter=".task-dropdown"
+        :disabled="disabled"
         @update="updateChecklist"
       >
         <div
diff --git a/website/client/src/libs/i18n.js b/website/client/src/libs/i18n.js
index 7079d7e4eb..d252374ecd 100644
--- a/website/client/src/libs/i18n.js
+++ b/website/client/src/libs/i18n.js
@@ -21,7 +21,7 @@ function loadLocale (i18nData) {
     script.type = 'text/javascript';
     script.text = i18nData.momentLang;
     head.appendChild(script);
-    moment.locale(language.momentLangCode);
+    moment.updateLocale(language.momentLangCode);
   }
 }