diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
index 5317a8604..601b3f209 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
@@ -84,7 +84,7 @@
 								<app-dataset-external-references-editor-component [formGroup]="formGroup" [viewOnly]="viewOnly"></app-dataset-external-references-editor-component>
 							</form>
 						</mat-tab>
-						<mat-tab [disabled]="isNew && (formGroup.get('profile').disabled || formGroup.get('profile').invalid)">
+						<mat-tab [disabled]="isNew && (formGroup.get('profile').disabled || !(formGroup.get('profile').valid))">
 							<ng-template mat-tab-label>
 								<div class="d-flex">
 									<mat-icon class="mr-2">library_books</mat-icon>
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
index b361418d0..b87afe59e 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
@@ -396,7 +396,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
 	public isSemiFormValid(formGroup: FormGroup): boolean {
 		var isValid: boolean = true;
 		Object.keys(formGroup.controls).forEach(controlName => {
-			if (controlName != 'datasetProfileDefinition' && formGroup.get(controlName).invalid) {
+			if (controlName != 'datasetProfileDefinition' && !(formGroup.get(controlName).valid)) {
 				isValid = false;
 			}
 		});
diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html
index 9b3bca847..2cac94611 100644
--- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html
+++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.html
@@ -32,7 +32,7 @@
 								</div>
 								<div class="navigation-buttons-container">
 									<button matStepperPrevious mat-raised-button color="primary">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.BACK' | translate}}</button>
-									<button class="float-right" [disabled]="this.formGroup.get('dmp').get('datasetProfile').invalid" matStepperNext mat-raised-button color="primary">
+									<button class="float-right" [disabled]="!(this.formGroup.get('dmp').get('datasetProfile').valid)" matStepperNext mat-raised-button color="primary">
 										{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.NEXT' | translate}}
 									</button>
 								</div>