diff --git a/website/client/src/components/header/messageCount.functional.vue b/website/client/src/components/header/messageCount.vue
similarity index 100%
rename from website/client/src/components/header/messageCount.functional.vue
rename to website/client/src/components/header/messageCount.vue
diff --git a/website/client/src/components/header/notifications/challengeInvitation.functional.vue b/website/client/src/components/header/notifications/challengeInvitation.vue
similarity index 100%
rename from website/client/src/components/header/notifications/challengeInvitation.functional.vue
rename to website/client/src/components/header/notifications/challengeInvitation.vue
diff --git a/website/client/src/components/header/notificationsDropdown.vue b/website/client/src/components/header/notificationsDropdown.vue
index d0e660c0d2..caafc06c8e 100644
--- a/website/client/src/components/header/notificationsDropdown.vue
+++ b/website/client/src/components/header/notificationsDropdown.vue
@@ -117,14 +117,14 @@ import * as quests from '@/../../common/script/content/quests';
 import { hasCompletedOnboarding } from '@/../../common/script/libs/onboarding';
 import notificationsIcon from '@/assets/svg/notifications.svg';
 import MenuDropdown from '../ui/customMenuDropdown';
-import MessageCount from './messageCount.functional';
+import MessageCount from './messageCount.vue';
 import { CONSTANTS, getLocalSetting, setLocalSetting } from '@/libs/userlocalManager';
 import successImage from '@/assets/svg/success.svg';
 import starBadge from '@/assets/svg/star-badge.svg';
 
 // Notifications
 import CARD_RECEIVED from './notifications/cardReceived';
-import CHALLENGE_INVITATION from './notifications/challengeInvitation.functional.vue';
+import CHALLENGE_INVITATION from './notifications/challengeInvitation.vue';
 import GIFT_ONE_GET_ONE from './notifications/g1g1';
 import GROUP_TASK_ASSIGNED from './notifications/groupTaskAssigned';
 import GROUP_TASK_CLAIMED from './notifications/groupTaskClaimed';
diff --git a/website/client/src/components/header/userDropdown.vue b/website/client/src/components/header/userDropdown.vue
index 20629daf95..7203cfae88 100644
--- a/website/client/src/components/header/userDropdown.vue
+++ b/website/client/src/components/header/userDropdown.vue
@@ -141,7 +141,7 @@
 import { mapState } from '@/libs/store';
 import userIcon from '@/assets/svg/user.svg';
 import MenuDropdown from '../ui/customMenuDropdown';
-import MessageCount from './messageCount.functional';
+import MessageCount from './messageCount.vue';
 import { EVENTS } from '@/libs/events';
 import { PAGES } from '@/libs/consts';
 
diff --git a/website/client/src/components/inventory/items/index.vue b/website/client/src/components/inventory/items/index.vue
index e1df439a36..5c278b176a 100644
--- a/website/client/src/components/inventory/items/index.vue
+++ b/website/client/src/components/inventory/items/index.vue
@@ -231,7 +231,7 @@
       <div v-if="currentDraggingEgg != null">
         <div
           class="potion-icon"
-          :class="'Pet_Egg_'+currentDraggingEgg.key"
+          :class="`Pet_Egg_${currentDraggingEgg.key}`"
         ></div>
         <div class="popover">
           <div class="popover-content">
@@ -248,7 +248,7 @@
       <div v-if="currentDraggingEgg != null">
         <div
           class="potion-icon"
-          :class="'Pet_Egg_'+currentDraggingEgg.key"
+          :class="`Pet_Egg_${currentDraggingEgg.key}`"
         ></div>
         <div class="popover">
           <div
@@ -266,7 +266,7 @@
       <div v-if="currentDraggingPotion != null">
         <div
           class="potion-icon"
-          :class="'Pet_HatchingPotion_'+currentDraggingPotion.key"
+          :class="`Pet_HatchingPotion_${currentDraggingPotion.key}`"
         ></div>
         <div class="popover">
           <div
@@ -285,7 +285,7 @@
       <div v-if="currentDraggingPotion != null">
         <div
           class="potion-icon"
-          :class="'Pet_HatchingPotion_'+currentDraggingPotion.key"
+          :class="`Pet_HatchingPotion_${currentDraggingPotion.key}`"
         ></div>
         <div class="popover">
           <div
diff --git a/website/client/src/components/inventory/stable/foodItem.vue b/website/client/src/components/inventory/stable/foodItem.vue
index 6159f22b8d..bf4f6778ce 100644
--- a/website/client/src/components/inventory/stable/foodItem.vue
+++ b/website/client/src/components/inventory/stable/foodItem.vue
@@ -16,7 +16,7 @@
         <span
           v-drag.food="item.key"
           class="item-content"
-          :class="'Pet_Food_'+item.key"
+          :class="`Pet_Food_${item.key}`"
           @itemDragEnd="dragend($event)"
           @itemDragStart="dragstart($event)"
         ></span>
diff --git a/website/client/src/components/inventory/stable/hatchingModal.vue b/website/client/src/components/inventory/stable/hatchingModal.vue
index ba05037e82..9efa21ae94 100644
--- a/website/client/src/components/inventory/stable/hatchingModal.vue
+++ b/website/client/src/components/inventory/stable/hatchingModal.vue
@@ -6,10 +6,10 @@
     >
       <div class="potionEggGroup">
         <div class="potionEggBackground">
-          <div :class="'Pet_HatchingPotion_'+hatchablePet.potionKey"></div>
+          <div :class="`Pet_HatchingPotion_${hatchablePet.potionKey}`"></div>
         </div>
         <div class="potionEggBackground">
-          <div :class="'Pet_Egg_'+hatchablePet.eggKey"></div>
+          <div :class="`Pet_Egg_${hatchablePet.eggKey}`"></div>
         </div>
       </div>
       <h4 class="title">
diff --git a/website/client/src/components/inventory/stable/index.vue b/website/client/src/components/inventory/stable/index.vue
index 4087784c29..13c7481bb4 100644
--- a/website/client/src/components/inventory/stable/index.vue
+++ b/website/client/src/components/inventory/stable/index.vue
@@ -268,7 +268,7 @@
       <div v-if="currentDraggingFood != null">
         <div
           class="food-icon"
-          :class="'Pet_Food_'+currentDraggingFood.key"
+          :class="`Pet_Food_${currentDraggingFood.key}`"
         ></div>
         <div class="popover">
           <div
@@ -287,7 +287,7 @@
       <div v-if="currentDraggingFood != null">
         <div
           class="food-icon"
-          :class="'Pet_Food_'+currentDraggingFood.key"
+          :class="`Pet_Food_${currentDraggingFood.key}`"
         ></div>
         <div class="popover">
           <div
diff --git a/website/client/src/components/payments/selectUserModal.vue b/website/client/src/components/payments/selectUserModal.vue
index 46c530b11a..3bfa32b92c 100644
--- a/website/client/src/components/payments/selectUserModal.vue
+++ b/website/client/src/components/payments/selectUserModal.vue
@@ -73,9 +73,7 @@
           :is-valid="foundUser._id"
 
           :placeholder="$t('usernameOrUserId')"
-          :invalid-issues="userSearchTerm.length > 0 && userNotFound
-            ? [ $t('userWithUsernameOrUserIdNotFound') ]
-            : [ '']"
+          :invalid-issues="userInputInvalidIssues"
         />
 
         <div class="d-flex flex-column justify-content-center align-items-middle mt-3">
@@ -101,11 +99,6 @@
             class="g1g1-cancel d-flex justify-content-center"
             @click="close()"
             v-html="$t('cancel')"
-          >
-            {{ $t('cancel') }}
-          </div>
-          <div
-            v-else
           >
           </div>
         </div>
@@ -115,18 +108,20 @@
       slot="modal-footer"
       class="g1g1-fine-print text-center pt-3"
     >
-      <strong>
+      <strong v-once>
         {{ $t('howItWorks') }}
       </strong>
       <p
+        v-once
         class="mx-5 mt-1"
       >
         {{ $t('g1g1HowItWorks') }}
       </p>
-      <strong>
+      <strong v-once>
         {{ $t('limitations') }}
       </strong>
       <p
+        v-once
         class="mx-5 mt-1"
       >
         {{ $t('g1g1Limitations') }}
@@ -323,6 +318,12 @@ export default {
       if (this.userSearchTerm.length < 1) return true;
       return typeof this.foundUser._id === 'undefined';
     },
+
+    userInputInvalidIssues () {
+      return this.userSearchTerm.length > 0 && this.userNotFound
+        ? [this.$t('userWithUsernameOrUserIdNotFound')]
+        : [''];
+    },
   },
   watch: {
     userSearchTerm: {
diff --git a/website/client/src/components/shops/featuredItemsHeader.vue b/website/client/src/components/shops/featuredItemsHeader.vue
index 4d23ca3dad..416814bec0 100644
--- a/website/client/src/components/shops/featuredItemsHeader.vue
+++ b/website/client/src/components/shops/featuredItemsHeader.vue
@@ -35,7 +35,7 @@
             :key="item.key"
             :item="item"
             :price="item.value"
-            :item-content-class="'shop_'+item.key"
+            :item-content-class="`shop_${item.key}`"
             :empty-item="false"
             :popover-position="'top'"
             @click="featuredItemSelected(item)"
diff --git a/website/client/src/components/shops/gemPrice.vue b/website/client/src/components/shops/gemPrice.vue
index 93a29eb515..988aec5ac9 100644
--- a/website/client/src/components/shops/gemPrice.vue
+++ b/website/client/src/components/shops/gemPrice.vue
@@ -1,10 +1,11 @@
 <template>
   <div
+    v-once
     class="gem-price-div"
     :class="{'background': withBackground}"
   >
     <div
-      :class="'mr-2 svg-icon gem icon-' +iconSize"
+      :class="`mr-2 svg-icon gem icon-${iconSize}`"
       v-html="icons.gem"
     ></div>
     <span class="gem-price">{{ gemPrice }}</span>
diff --git a/website/client/src/components/shops/quests/index.vue b/website/client/src/components/shops/quests/index.vue
index c6607a643c..06bd3334db 100644
--- a/website/client/src/components/shops/quests/index.vue
+++ b/website/client/src/components/shops/quests/index.vue
@@ -92,7 +92,7 @@
                 :item="item"
                 :price="item.goldValue ? item.goldValue : item.value"
                 :price-type="item.goldValue ? 'gold' : 'gem'"
-                :item-content-class="'inventory_quest_scroll_'+item.key"
+                :item-content-class="`inventory_quest_scroll_${item.key}`"
                 :empty-item="false"
                 :popover-position="'top'"
                 @click="selectItem(item)"
diff --git a/website/client/src/components/shops/quests/questRewards.vue b/website/client/src/components/shops/quests/questRewards.vue
index 21568f3bfa..9d7b185120 100644
--- a/website/client/src/components/shops/quests/questRewards.vue
+++ b/website/client/src/components/shops/quests/questRewards.vue
@@ -82,7 +82,7 @@
 
       <item-with-label
         v-for="drop in getDropsList(quest.drop.items, false)"
-        :key="drop.type+'_'+drop.key"
+        :key="`${drop.type}_${drop.key}`"
         :item="{}"
         class="item-with-label"
       >
diff --git a/website/client/src/components/tasks/taskModal.vue b/website/client/src/components/tasks/taskModal.vue
index e5a9b3cee0..f96f46486c 100644
--- a/website/client/src/components/tasks/taskModal.vue
+++ b/website/client/src/components/tasks/taskModal.vue
@@ -1095,10 +1095,12 @@ export default {
     // region advanced settings
     advancedSettingsShowAdjustCounter () {
       return this.task.type === 'habit'
-                  && this.isUserTask && this.purpose === 'edit' && (this.task.up || this.task.down);
+        && this.isUserTask && this.purpose === 'edit'
+        && (this.task.up || this.task.down);
     },
     advancedSettingsShowRestoreStreak () {
-      return this.task.type === 'daily' && this.isUserTask && this.purpose === 'edit';
+      return this.task.type === 'daily' && this.isUserTask
+        && this.purpose === 'edit';
     },
     advancedSettingsShowTaskAlias () {
       return this.isUserTask && this.user.preferences.developerMode;
diff --git a/website/client/src/components/ui/informationIcon.vue b/website/client/src/components/ui/informationIcon.vue
index 75f5b7a00b..fb336754a1 100644
--- a/website/client/src/components/ui/informationIcon.vue
+++ b/website/client/src/components/ui/informationIcon.vue
@@ -1,14 +1,14 @@
 <template>
   <span class="ml-1">
     <div
-      :id="'tooltip_'+tooltipId"
+      :id="`tooltip_${tooltipId}`"
       class="svg-icon icon-16"
       :title="tooltip"
       v-html="icons.information"
     ></div>
     <b-tooltip
       :title="tooltip"
-      :target="'tooltip_'+tooltipId"
+      :target="`tooltip_${tooltipId}`"
     />
   </span>
 </template>