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 53fa22b..a842e22 100644
--- a/src/app/components/contacts/contact-detail/contact-detail.component.html
+++ b/src/app/components/contacts/contact-detail/contact-detail.component.html
@@ -6,6 +6,7 @@
       <div class="metrics-txt">Better with a team</div>
     </div>
     <img
+      [ngClass]="{ 'd-none': !currentUserId }"
       (click)="closeUserDetails()"
       src="./../../../../assets/img/arrow-left.svg"
     />
diff --git a/src/app/components/contacts/contact-edit/contact-edit.component.scss b/src/app/components/contacts/contact-edit/contact-edit.component.scss
index 3dd1339..f5df0bb 100644
--- a/src/app/components/contacts/contact-edit/contact-edit.component.scss
+++ b/src/app/components/contacts/contact-edit/contact-edit.component.scss
@@ -14,7 +14,7 @@ section {
 .dialog {
   background-color: var(--white);
   width: 760px;
-  height: 500px;
+  height: 550px;
   border-radius: 26px;
   border: 2px solid rgba($color: #000000, $alpha: 0.1);
 }
diff --git a/src/app/components/contacts/contact-form/contact-form.component.html b/src/app/components/contacts/contact-form/contact-form.component.html
index c0a4ac1..14121ca 100644
--- a/src/app/components/contacts/contact-form/contact-form.component.html
+++ b/src/app/components/contacts/contact-form/contact-form.component.html
@@ -17,9 +17,6 @@
         autocomplete="off"
         required
       />
-      @if (!firstName.valid && firstName.touched) {
-      <span>{{ "form.invalid-name" | translate }}</span>
-      }
       <input
         id="lastName"
         type="text"
@@ -31,10 +28,15 @@
         autocomplete="off"
         required
       />
-      @if (!lastName.valid && lastName.touched) {
-      <span>{{ "form.invalid-name" | translate }}</span>
-      }
     </div>
+    @if ((!firstName.valid && firstName.touched) && (!lastName.valid &&
+    lastName.touched)) {
+    <span>{{ "contact-dialog-form.invalid-name" | translate }}</span>
+    } @else { @if (!firstName.valid && firstName.touched) {
+    <span>{{ "contact-dialog-form.invalid-firstName" | translate }}</span>
+    } @else { @if (!lastName.valid && lastName.touched) {
+    <span>{{ "contact-dialog-form.invalid-lastName" | translate }}</span>
+    } } }
     <input
       id="email"
       type="email"
@@ -46,7 +48,7 @@
       required
     />
     @if (!email.valid && email.touched) {
-    <span>{{ "form.invalid-email" | translate }}</span>
+    <span>{{ "contact-dialog-form.invalid-email" | translate }}</span>
     }
     <input
       id="phone"
@@ -59,7 +61,7 @@
       required
     />
     @if (!phone.valid && phone.touched) {
-    <span>{{ "form.invalid-msg" | translate }}</span>
+    <span>{{ "contact-dialog-form.invalid-phone" | translate }}</span>
     }
     <div class="btns">
       <div class="btn">
@@ -67,14 +69,14 @@
           (click)="deleteContact()"
           class="btn-delete"
           type="button"
-          value="{{ 'form.btn-delete' | translate }}"
+          value="{{ 'contact-dialog-form.btn-delete' | translate }}"
         />
       </div>
       <div class="btn">
         <input
           class="btn-save"
           type="submit"
-          value="{{ 'form.btn-save' | translate }}"
+          value="{{ 'contact-dialog-form.btn-save' | translate }}"
           [disabled]="
             firstName.invalid ||
             !contactData.firstName ||
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index c15eb8e..e10a8af 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -9,6 +9,19 @@
     "english": "Englisch",
     "german": "Deutsch"
   },
+  "contact-dialog-form": {
+    "btn-delete": "Löschen",
+    "btn-save": "Sichern",
+    "invalid-firstName": "Ein Vorname ist erforderlich!",
+    "invalid-lastName": "Ein Nachname ist erforderlich!",
+    "invalid-name": "Ein Vorname & Nachname ist erforderlich!",
+    "invalid-email": "Eine E-Mail Adresse ist erforderlich!",
+    "invalid-phone": "Eine Telefonnummer ist erforderlich!"
+  },
+  "contact-delete-dialog": {
+    "btn-cancle": "Abbrechen",
+    "btn-delete": "Löschen"
+  },
   "summary": {
     "headlineDescription": "Schlüsselmetriken auf einen Blick",
     "morning": "Guten Morgen",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index fd6cf91..227f260 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -9,15 +9,14 @@
     "english": "English",
     "german": "German"
   },
-  "form": {
+  "contact-dialog-form": {
     "btn-delete": "Delete",
     "btn-save": "Save",
-    "invalid-name": "Your name is required!",
-    "invalid-email": "Your email is required!",
-    "invalid-msg": "More than 10 letters are required!",
-    "invalid-checkbox": "Please accept the privacy policy!",
-    "msg-send0": "Your message has been sent successfully.",
-    "msg-send1": "I will contact you shortly."
+    "invalid-firstName": "A first name is required!",
+    "invalid-lastName": "A last name is required!",
+    "invalid-name": "A first name & last name is required!",
+    "invalid-email": "A email is required!",
+    "invalid-phone": "A phone number is required!"
   },
   "contact-delete-dialog": {
     "btn-cancle": "Cancle",