diff --git a/src/modules/04_system/stores/main.ts b/src/modules/04_system/stores/main.ts
index 348a39bb..6f8028d1 100644
--- a/src/modules/04_system/stores/main.ts
+++ b/src/modules/04_system/stores/main.ts
@@ -208,8 +208,6 @@ export const useDataStore = defineStore("systemStore", () => {
       }
     }
 
-    console.log(allValues);
-
     if (typeReturn === "time") {
       if (allValues[2].includes("/")) {
         console.log(allValues[2]);
@@ -224,7 +222,16 @@ export const useDataStore = defineStore("systemStore", () => {
     }
 
     if (typeReturn === "date") {
-      return `${allValues[5].split(",")}`;
+      if (!allValues[3].includes("*")) {
+        const tempValue = allValues[3].split(",").join(" ");
+
+        return `${tempValue}`;
+      }
+
+      if (!allValues[5].includes("*")) {
+        const tempValue = allValues[5].split(",").join(" ");
+        return `${tempValue}`;
+      }
     }
 
     return "";
@@ -246,6 +253,7 @@ export const useDataStore = defineStore("systemStore", () => {
             timeStartEvery:
               convertCronToForm(item.schedule, "timeStartEvery") || "",
             startAt: item.startAt,
+            enabled: item.enabled,
           };
         });