diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
index 984bec575e..9e5f2c22e1 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -130,6 +130,14 @@ export class DsoEditMetadataValue {
   isReinstatable(): boolean {
     return hasValue(this.reinstatableValue) || hasValue(this.reinstatableChange);
   }
+
+  /**
+   * Reset the state of the re-instatable properties
+   */
+  resetReinstatable() {
+    this.reinstatableValue = undefined;
+    this.reinstatableChange = undefined;
+  }
 }
 
 /**
@@ -242,6 +250,7 @@ export class DsoEditMetadataForm {
    * undone afterwards
    */
   discard(): void {
+    this.resetReinstatable();
     Object.entries(this.fields).forEach(([field, values]) => {
       let removeFromIndex = -1;
       values.forEach((value, index) => {
@@ -293,6 +302,18 @@ export class DsoEditMetadataForm {
           .some((value) => value.isReinstatable()));
   }
 
+  /**
+   * Reset the state of the re-instatable properties and values
+   */
+  resetReinstatable() {
+    this.reinstatableNewValues = {};
+    Object.values(this.fields).forEach((values) => {
+      values.forEach((value) => {
+        value.resetReinstatable();
+      });
+    });
+  }
+
   /**
    * Get the json PATCH operations for the current changes within this form
    */
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 7578f2ec99..9664fd4d93 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -43,19 +43,19 @@
         </div>
         <div class="text-center ds-flex-cell ds-edit-cell">
           <div class="btn-group edit-field">
-            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.buttons.confirm' | translate }}"
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
                     [disabled]="!newMdField || (saving$ | async) || (loadingFieldValidation$ | async)" (click)="setMetadataField()">
               <i class="fas fa-check fa-fw"></i>
             </button>
-            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.remove' | translate }}"
+            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
                     [disabled]="true">
               <i class="fas fa-trash-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.undo' | translate }}"
+            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
                     [disabled]="(saving$ | async) || (loadingFieldValidation$ | async)" (click)="form.newValue = undefined">
               <i class="fas fa-undo-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-secondary ds-drag-handle btn-sm disabled" ngbTooltip="{{ dsoType + '.edit.buttons.drag' | translate }}"
+            <button class="btn btn-outline-secondary ds-drag-handle btn-sm disabled" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}"
                     [disabled]="true">
               <i class="fas fa-grip-vertical fa-fw"></i>
             </button>
@@ -82,25 +82,25 @@
         </div>
         <div class="text-center ds-flex-cell ds-edit-cell">
           <div class="btn-group edit-field">
-            <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
+            <button class="btn btn-outline-primary btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}" *ngIf="!mdValue.editing"
                     [disabled]="mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="mdValue.editing = true">
               <i class="fas fa-edit fa-fw"></i>
             </button>
-            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
-                    [disabled]="(saving$ | async)" (click)="mdValue.confirmChanges(); onValueSaved()">
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}" *ngIf="mdValue.editing"
+                    [disabled]="(saving$ | async)" (click)="mdValue.confirmChanges(); form.resetReinstatable(); onValueSaved()">
               <i class="fas fa-check fa-fw"></i>
             </button>
-            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.remove' | translate }}"
+            <button class="btn btn-outline-danger btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
                     [disabled]="mdValue.change || mdValue.editing || (saving$ | async)" (click)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; onValueSaved()">
               <i class="fas fa-trash-alt fa-fw"></i>
             </button>
-            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.buttons.undo' | translate }}"
+            <button class="btn btn-outline-warning btn-sm" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
                     [disabled]="(!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); onValueSaved()">
               <i class="fas fa-undo-alt fa-fw"></i>
             </button>
             <!-- TODO: Enable drag -->
             <button class="btn btn-outline-secondary ds-drag-handle btn-sm"
-                    [ngClass]="{'disabled': form.fields[mdField].length === 1 || (saving$ | async)}" ngbTooltip="{{ dsoType + '.edit.buttons.drag' | translate }}" [disabled]="form.fields[mdField].length === 1 || (saving$ | async)">
+                    [ngClass]="{'disabled': form.fields[mdField].length === 1 || (saving$ | async)}" ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}" [disabled]="form.fields[mdField].length === 1 || (saving$ | async)">
               <i class="fas fa-grip-vertical fa-fw"></i>
             </button>
           </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index eee2bc963c..2f6f32c1c1 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -186,6 +186,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
    * Validate the metadata field first
    */
   setMetadataField() {
+    this.form.resetReinstatable();
     this.loadingFieldValidation$.next(true);
     this.metadataFieldSelectorComponent.validate().subscribe((valid) => {
       this.loadingFieldValidation$.next(false);