diff --git a/website/client/components/achievements/chooseClass.vue b/website/client/components/achievements/chooseClass.vue
index 204a389c64..e30189627f 100644
--- a/website/client/components/achievements/chooseClass.vue
+++ b/website/client/components/achievements/chooseClass.vue
@@ -154,6 +154,7 @@ export default {
       this.$root.$emit('bv::hide::modal', 'choose-class');
     },
     clickSelectClass (heroClass) {
+      if (this.user.flags.classSelected && !confirm(this.$t('changeClassConfirmCost'))) return;
       this.$store.dispatch('user:changeClass', {query: {class: heroClass}});
     },
     clickDisableClasses () {
diff --git a/website/client/store/actions/user.js b/website/client/store/actions/user.js
index 8b0c7400c6..97c5080543 100644
--- a/website/client/store/actions/user.js
+++ b/website/client/store/actions/user.js
@@ -81,6 +81,8 @@ export async function changeClass (store, params) {
   const user = store.state.user.data;
 
   changeClassOp(user, params);
+  user.flags.classSelected = true;
+
   let response = await axios.post(`/api/v3/user/change-class?class=${params.query.class}`);
   return response.data.data;
 }