diff --git a/src/pages/createQuize/MyQuizzesFull.tsx b/src/pages/createQuize/MyQuizzesFull.tsx
index 2afa4c42..b889e5fe 100644
--- a/src/pages/createQuize/MyQuizzesFull.tsx
+++ b/src/pages/createQuize/MyQuizzesFull.tsx
@@ -7,7 +7,7 @@ import {
   useMediaQuery,
   useTheme,
 } from "@mui/material";
-import { createQuiz } from "@root/quizes/actions";
+import { createQuiz, updateQuiz } from "@root/quizes/actions";
 import { useQuizes } from "@root/quizes/hooks";
 import SectionWrapper from "@ui_kit/SectionWrapper";
 import React from "react";
@@ -16,6 +16,7 @@ import { resetEditConfig } from "@root/quizes/actions";
 import FirstQuiz from "./FirstQuiz";
 import QuizCard from "./QuizCard";
 import HeaderFull from "@ui_kit/Header/HeaderFull";
+import QuizgenegationName from "@utils/quizgenegationName";
 
 interface Props {
   outerContainerSx?: SxProps<Theme>;
@@ -76,6 +77,11 @@ export default function MyQuizzesFull({
             }}
           >
             {quizes.map((quiz) => {
+              if (quiz.name.length === 0 || quiz.name === " ") {
+                updateQuiz(quiz.id, (quiz) => {
+                  quiz.name = QuizgenegationName({ quiz });
+                });
+              }
               return (
                 <QuizCard
                   key={quiz.id}
diff --git a/src/pages/createQuize/QuizCard.tsx b/src/pages/createQuize/QuizCard.tsx
index 4bb02088..1f8313f4 100755
--- a/src/pages/createQuize/QuizCard.tsx
+++ b/src/pages/createQuize/QuizCard.tsx
@@ -97,11 +97,7 @@ export default function QuizCard({
         }}
         variant="h5"
       >
-        {quiz.name.length === 0 || quiz.name === " "
-          ? quiz.config.type === "form"
-            ? "Form " + quiz.backendId.toString().slice(-4).replace(/^0/, "1")
-            : "Quiz " + quiz.backendId.toString().slice(-4).replace(/^0/, "1")
-          : quiz.name}
+        {quiz.name}
       </Typography>
       <Box
         sx={{
diff --git a/src/pages/startPage/stepOne.tsx b/src/pages/startPage/stepOne.tsx
index 6eb89ed7..7d36ae04 100755
--- a/src/pages/startPage/stepOne.tsx
+++ b/src/pages/startPage/stepOne.tsx
@@ -2,12 +2,13 @@ import { Box, Button, useMediaQuery, useTheme } from "@mui/material";
 import CreationCard from "@ui_kit/CreationCard";
 import quizCreationImage1 from "../../assets/quiz-creation-1.png";
 import quizCreationImage2 from "../../assets/quiz-creation-2.png";
-import { setQuizType } from "@root/quizes/actions";
+import { setQuizType, updateQuiz } from "@root/quizes/actions";
 import { useCurrentQuiz } from "@root/quizes/hooks";
 import { useEffect, useRef, useState } from "react";
 
 import arrowLeftIcon from "../../assets/icons/arrow_left.svg";
 import arrowRightIcon from "../../assets/icons/arrow_right.svg";
+import QuizgenegationName from "@utils/quizgenegationName";
 
 export default function StepOne() {
   const quiz = useCurrentQuiz();
@@ -69,6 +70,9 @@ export default function StepOne() {
           data-cy="create-quiz-card"
           onClick={() => {
             setQuizType(quiz.id, "quiz");
+            updateQuiz(quiz.id, (quiz) => {
+              quiz.name = QuizgenegationName({ quiz });
+            });
           }}
         >
           <CreationCard
@@ -84,6 +88,9 @@ export default function StepOne() {
           variant="text"
           onClick={() => {
             setQuizType(quiz.id, "form");
+            updateQuiz(quiz.id, (quiz) => {
+              quiz.name = QuizgenegationName({ quiz });
+            });
           }}
         >
           <CreationCard
diff --git a/src/utils/quizgenegationName.ts b/src/utils/quizgenegationName.ts
new file mode 100644
index 00000000..2e1bf42c
--- /dev/null
+++ b/src/utils/quizgenegationName.ts
@@ -0,0 +1,16 @@
+import { Quiz } from "@model/quiz/quiz";
+interface Props {
+  quiz: Quiz;
+}
+export default function QuizgenegationName({ quiz }: Props) {
+  let QuizgenegationName = "";
+  quiz.config.type === "form"
+    ? (QuizgenegationName =
+        "Form " + quiz.backendId.toString().slice(-4).replace(/^0/, "1"))
+    : quiz.config.type === "quiz"
+      ? (QuizgenegationName =
+          "Quiz " + quiz.backendId.toString().slice(-4).replace(/^0/, "1"))
+      : (QuizgenegationName =
+          "No type " + quiz.backendId.toString().slice(-4).replace(/^0/, "1"));
+  return QuizgenegationName;
+}