diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index f6654a8..38ea610 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -189,7 +189,7 @@
 </div>
 <modal-alert #editStakeholderModal
              (alertOutput)="saveStakeholder()"
-             [okDisabled]="stakeholderFb && (stakeholderFb.invalid || (!stakeholderFb.dirty && index !==-1))">
+             [okDisabled]="stakeholderFb && (stakeholderFb.invalid || (stakeholderFb.pristine && index !==-1))">
   <div *ngIf="stakeholderFb" class="uk-padding-small" [formGroup]="stakeholderFb">
     <div dashboard-input class="uk-form-row" [formInput]="stakeholderFb.get('index_name')" label="Name"></div>
     <div class="uk-form-row uk-flex uk-flex-middle uk-child-width-1-3" uk-grid>
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 282a518..c52a2b7 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -167,7 +167,9 @@ export class HomeComponent implements OnInit, OnDestroy {
                 [
                     Validators.required,
                     this.stakeholderUtils.aliasValidator(
-                        (this.stakeholder.isDefaultProfile) ? this.defaultStakeholders : this.stakeholders
+                        (this.stakeholder.isDefaultProfile) ?
+                            this.defaultStakeholders.filter(stakeholder => stakeholder.alias !== this.stakeholder.alias):
+                            this.stakeholders.filter(stakeholder => stakeholder.alias !== this.stakeholder.alias)
                     )]
             ),
             isPublic: this.fb.control(this.stakeholder.isPublic),