diff --git a/src/app/components/add-task/add-task.component.html b/src/app/components/add-task/add-task.component.html
index 55ecaf2..489871b 100644
--- a/src/app/components/add-task/add-task.component.html
+++ b/src/app/components/add-task/add-task.component.html
@@ -309,7 +309,7 @@
               ? 'block'
               : 'none'
         }"
-        (click)="removeTaskData()"
+        (click)="removeTaskData(taskForm)"
       ></app-form-btn>
       <app-form-btn
         [class]="'btn-delete'"
diff --git a/src/app/components/add-task/add-task.component.ts b/src/app/components/add-task/add-task.component.ts
index 0eaccc5..a3108f4 100644
--- a/src/app/components/add-task/add-task.component.ts
+++ b/src/app/components/add-task/add-task.component.ts
@@ -180,8 +180,9 @@ export class AddTaskComponent implements OnInit {
     localStorage.setItem('taskData', JSON.stringify(this.taskData));
   }
 
-  removeTaskData() {
+  removeTaskData(form: NgForm) {
     localStorage.removeItem('taskData');
+    this.clearForm(form);
     this.clearFormData();
   }
 
@@ -189,9 +190,13 @@ export class AddTaskComponent implements OnInit {
     this.overlayService.setOverlayData('', '');
   }
 
+  clearForm(form: NgForm) {
+    form.controls['title'].reset();
+    form.controls['description'].reset();
+    form.controls['category'].reset();
+  }
+
   clearFormData() {
-    this.taskData.title = '';
-    this.taskData.description = '';
     this.taskData.date = this.currentDate;
     this.taskData.category = '';
     this.taskData.assigned = [];
@@ -226,7 +231,7 @@ export class AddTaskComponent implements OnInit {
       if (allowedValues.includes(overlayData)) {
         const { id, ...taskWithoutId } = this.taskData;
         this.firebaseService.addNewTask(taskWithoutId);
-        this.removeTaskData();
+        this.removeTaskData(ngForm);
         this.closeOverlay();
       } else {
         if (this.getTaskData(overlayData).length > 0) {
@@ -255,8 +260,4 @@ export class AddTaskComponent implements OnInit {
       this.isAssignedOpen = false;
     }
   }
-
-  ngOnDestroy() {
-    this.removeTaskData();
-  }
 }
diff --git a/src/app/components/contacts/contact-detail/contact-detail.component.html b/src/app/components/contacts/contact-detail/contact-detail.component.html
index 00cada1..76dafa0 100644
--- a/src/app/components/contacts/contact-detail/contact-detail.component.html
+++ b/src/app/components/contacts/contact-detail/contact-detail.component.html
@@ -42,7 +42,7 @@
           {{ user.firstName }}
           {{ user.lastName }}
           @if (user.id === firebaseService.getCurrentUserId()) {
-          <p>&nbsp;{{ "contacts.you" | translate }}</p>
+          {{ "contacts.you" | translate }}
           }
         </div>
         @if(user.uId === "" || user.id === firebaseService.getCurrentUserId()) {