diff --git a/frontend/src/components/AnswerForm.vue b/frontend/src/components/AnswerForm.vue
index 87873f7..7e0fd9c 100644
--- a/frontend/src/components/AnswerForm.vue
+++ b/frontend/src/components/AnswerForm.vue
@@ -1,11 +1,6 @@
 <script setup>
-import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { defineEmits, onMounted, ref } from 'vue';
-
-// default variables
-const route = useRoute();
-const id_category = route.params.id_category;
+import { defineEmits, onMounted, ref, defineProps, watch } from 'vue';
 
 // variables specific to this component
 const emit = defineEmits(['newQuestion'])
@@ -17,6 +12,13 @@ const options = ref([]);
 
 const response_to_answer = ref(null);
 
+const props = defineProps({
+    hasAskedOptions: {
+        type: Boolean,
+        required: true,
+    }
+})
+
 const submitAnswerText = async () => {
     const response = await axios.post(`/api/question/answer_text/`, {
         answer: answer_text.value,
@@ -39,12 +41,6 @@ const fetchOptions = async () => {
     });
     options.value = response.data.options;
 }
-
-const hasAskedOptions = async () => {
-    const response = await axios.get(`/api/question/has_asked_options/`); // TODO
-    return !!response.data.has_asked_options; // TODO
-}
-
 const newQuestion = () => {
     answer_sent.value = false;
     show_text_form.value = true;
@@ -52,16 +48,19 @@ const newQuestion = () => {
     emit('newQuestion');
 }
 
-onMounted(() => {
-    // ask backend if the user has already ask options in this category
-    // if so, show the options form
-    /*
-    if (hasAskedOptions()) {
+const displayOptionsAsked = () => {
+    if (props.hasAskedOptions) {
         fetchOptions();
         show_text_form.value = false;
-    }*/
-    // if not, show the text form (default value is true)
+    }
+}
+
+onMounted(() => {
+    displayOptionsAsked();
+});
 
+watch(() => props.hasAskedOptions, () => {
+    displayOptionsAsked();
 });
 </script>
 
@@ -77,7 +76,7 @@ onMounted(() => {
         </div>
         <div v-else>
             <p v-if="response_to_answer.user_is_correct" class="right-answer info-answer box">
-                Good job! {{ response_to_answer.right_answer }} was the right answer!
+                Good job! "{{ response_to_answer.right_answer }}" was the right answer!
             </p>
             <p v-else class="wrong-answer info-answer box">
                 Unfortunately, your answer "{{ response_to_answer.answer_sent }}" was wrong. The correct answer was "{{
@@ -94,7 +93,7 @@ onMounted(() => {
             <p v-else class="wrong-answer info-answer box">
                 Unfortunately, your answer "{{ response_to_answer.answer_sent }}" was wrong. The correct answer was "{{
         response_to_answer.right_answer }}"</p>
-        
+
             <button class="btn" @click="newQuestion">Next question</button>
         </div>
         <div v-else class="box">
diff --git a/frontend/src/views/QuizView.vue b/frontend/src/views/QuizView.vue
index 17d4761..a6c81ac 100644
--- a/frontend/src/views/QuizView.vue
+++ b/frontend/src/views/QuizView.vue
@@ -9,12 +9,17 @@ const route = useRoute();
 const id_category = route.params.id_category;
 
 // variables specific to this component
-const question = ref("");
+const question = ref(null);
+const hasAskedOptions = ref(false);
 
 const fetchNewQuestion = async () => {
-    const response = await axios.get(`/api/question/${id_category}/new`, {
+    const responseQuestion = await axios.get(`/api/question/${id_category}/new`, {
     });
-    question.value = response.data.text;
+    question.value = responseQuestion.data.text;
+
+    // wait for the question before checking if the user has asked for options
+    const responseOptionAsked = await axios.get(`/api/question/options_asked`);
+    hasAskedOptions.value = !!responseOptionAsked.data.options_asked;
 }
 
 onMounted(() => {
@@ -28,8 +33,8 @@ onMounted(() => {
         <p class="info">Answer correctly to the question and earn as many IQs as possible!</p>
         <h1 class="title">Question</h1>
         <p class="question box">{{ question }}</p>
-        <AnswerForm @new-question="fetchNewQuestion" />
-        <LeaderBoard :id_category="Number(id_category)" />
+        <AnswerForm @new-question="fetchNewQuestion" :hasAskedOptions="hasAskedOptions"/>
+        <LeaderBoard :id_category="Number(id_category)"/>
     </section>
 </template>