diff --git a/src/app/components/add-task/add-task.component.html b/src/app/components/add-task/add-task.component.html
index 8168f4e..66c0a8b 100644
--- a/src/app/components/add-task/add-task.component.html
+++ b/src/app/components/add-task/add-task.component.html
@@ -192,8 +192,8 @@
             <option value="" disabled [selected]="!taskData.category">
               Select task category
             </option>
-            <option value="1">User Story</option>
-            <option value="2">Technical Task</option>
+            <option value="User Story">User Story</option>
+            <option value="Technical Task">Technical Task</option>
           </select>
           <div class="error-msg">
             @if (!category.valid && category.touched) {
diff --git a/src/app/components/add-task/add-task.component.ts b/src/app/components/add-task/add-task.component.ts
index 8c9a805..1e6c7c5 100644
--- a/src/app/components/add-task/add-task.component.ts
+++ b/src/app/components/add-task/add-task.component.ts
@@ -29,16 +29,15 @@ export class AddTaskComponent {
   constructor(public firebaseService: FirebaseService) {}
 
   taskData: Task = {
-    id: '',
     title: '',
     description: '',
     category: '',
-    status: '',
+    status: 'todo',
     priority: 'medium',
     subtasksTitle: [],
     subtasksDone: [],
     assigned: [],
-    date: '',
+    date: this.currentDate,
   };
 
   receiveAssigned(assigned: string[]) {
@@ -135,11 +134,13 @@ export class AddTaskComponent {
     this.taskData.category = '';
     this.taskData.assigned = [];
     this.taskData.subtasksTitle = [];
+    this.taskData.subtasksDone = [];
   }
 
   onSubmit(ngForm: NgForm) {
     if (ngForm.submitted && ngForm.form.valid) {
-      this.firebaseService.addNewTask(this.taskData);
+      const { id, ...taskWithoutId } = this.taskData;
+      this.firebaseService.addNewTask(taskWithoutId);
       this.removeTaskData();
     }
   }
diff --git a/src/app/interfaces/task.interface.ts b/src/app/interfaces/task.interface.ts
index f6167d3..2814c4a 100644
--- a/src/app/interfaces/task.interface.ts
+++ b/src/app/interfaces/task.interface.ts
@@ -1,5 +1,5 @@
 export interface Task {
-  id: string;
+  id?: string;
   title: string;
   description: string;
   category: string;
diff --git a/src/app/services/drag-drop.service.ts b/src/app/services/drag-drop.service.ts
index c3a898e..15c7c56 100644
--- a/src/app/services/drag-drop.service.ts
+++ b/src/app/services/drag-drop.service.ts
@@ -8,8 +8,10 @@ export class DragDropService {
 
   constructor() {}
 
-  startDragging(event: DragEvent, id: string) {
-    event.dataTransfer?.setData('text/plain', id);
+  startDragging(event: DragEvent, id: string | undefined) {
+    if (id !== undefined) {
+      event.dataTransfer?.setData('text/plain', id);
+    }
   }
 
   allowDrop(event: DragEvent) {