diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html
index aec8745..bb468ba 100644
--- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html
@@ -118,8 +118,6 @@
         af-variation="warning"
         af-heading="Du har inte gjort några ändringar"
         af-heading-level="h4"
-        [afCloseable]="true"
-        (afOnClose)="displayPristineWarning = false"
       >
         <p>Du har inte gjort några ändringar i formuläret. För att spara personalkontot behöver ändringar göras.</p>
       </digi-notification-alert>
diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts
index db1095f..0b39552 100644
--- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.ts
@@ -64,12 +64,12 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
   readonly utforandeVerksamhetElementId = `utforande-verksamhet-control-${this.formUuid}`;
   readonly firstValidationErrorLinkId = `validation-error-link-${this.formUuid}`;
 
+  private _submitted = false;
+
   editEmployeeFormGroup: FormGroup | null = null;
   displayEditWithoutRolesDialog = false;
-  displayPristineWarning = false;
 
   displayRolesDialog = false;
-  displayErrorSummary = false;
 
   selectableTjansterFormItems: Array<FormSelectItem> | null = null;
 
@@ -133,6 +133,13 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
     return this.editEmployeeFormGroup?.get(this.selectAllUtforandeVerksamheterFormControlName);
   }
 
+  get displayPristineWarning(): boolean {
+    return this._submitted && this.editEmployeeFormGroup.pristine && this.editEmployeeFormGroup.valid;
+  }
+  get displayErrorSummary(): boolean {
+    return this._submitted && this.editEmployeeFormGroup.invalid;
+  }
+
   private updateUtforandeVerksamhetStatus(): void {
     if (this.availableUtforandeVerksamheter && this.availableUtforandeVerksamheter.length > 0) {
       this.utforandeVerksamheterFormControl.enable();
@@ -195,16 +202,14 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
   }
 
   onFormSubmitted(saveWithoutRoles = false): void {
+    this._submitted = true;
     if (!this.editEmployeeFormGroup || this.isLoadingUtforandeVerksamheter) {
       return;
     }
 
-    this.displayPristineWarning = this.editEmployeeFormGroup.pristine;
-
     this.editEmployeeFormGroup.markAllAsTouched();
 
-    if (this.editEmployeeFormGroup.invalid || this.editEmployeeFormGroup.pristine) {
-      this.displayErrorSummary = true;
+    if (this.editEmployeeFormGroup.invalid) {
       setTimeout(() => {
         this.focusLinkElement('.error-list__validation-error-link a');
       });
@@ -212,7 +217,9 @@ export class EditEmployeeFormComponent implements OnInit, OnChanges {
       return;
     }
 
-    this.displayErrorSummary = false;
+    if (this.editEmployeeFormGroup.pristine) {
+      return;
+    }
 
     const roles = this.employeeFormService.getRolesFromFormGroup(this.rolesFormGroup, this.availableRoles);