diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts
index 9b0132635..ce7f8b967 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/funder-form-model.ts
@@ -36,7 +36,7 @@ export class FunderFormModel {
 		baseContext.validation.push({ key: 'id', validators: [] });
 		baseContext.validation.push({ key: 'label', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'label')] });
 		baseContext.validation.push({ key: 'status', validators: [] });
-		baseContext.validation.push({ key: 'existFunder', validators: [Validators.required, ValidJsonValidator, BackendErrorValidator(this.validationErrorModel, 'existFunder')] });
+		baseContext.validation.push({ key: 'existFunder', validators: [BackendErrorValidator(this.validationErrorModel, 'existFunder')] });
 		return baseContext;
 	}
 
diff --git a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts
index 129c8862e..244c44097 100644
--- a/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts
+++ b/dmp-frontend/src/app/ui/quick-wizard/dmp-editor/dmp-editor-wizard.component.ts
@@ -31,7 +31,6 @@ export class DmpEditorWizardComponent extends BaseComponent implements OnInit, I
 	@Input() formGroup: FormGroup;
 	@Input() dmpLabel: string;
 	@Input() datasetFormGroup: FormGroup;
-	//formGroup: FormGroup = null;
 	private uiNotificationService: UiNotificationService
 
 	profilesAutoCompleteConfiguration: SingleAutoCompleteConfiguration;
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 e7feda185..523570bac 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
@@ -18,7 +18,7 @@
 								<app-quick-wizard-project-editor-component class="col-12" [formGroup]="formGroup.get('project')"></app-quick-wizard-project-editor-component>
 							</div>
 							<div class="navigation-buttons-container">
-								<button style="float:right;" matStepperNext mat-raised-button color="primary">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.NEXT' | translate}}</button>
+								<button class="float-right" [disabled]="formGroup.get('grant').invalid" matStepperNext mat-raised-button color="primary">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.NEXT' | translate}}</button>
 							</div>
 						</mat-step>
 						<mat-step [stepControl]="formGroup.get('dmp')">
@@ -32,8 +32,9 @@
 								</div>
 								<div class="navigation-buttons-container">
 									<button matStepperPrevious mat-raised-button color="primary">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.BACK' | translate}}</button>
-									<button style="float:right;" matStepperNext mat-raised-button color="primary">
-										{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.NEXT' | translate}}</button>
+									<button class="float-right" [disabled]="this.formGroup.get('dmp').get('datasetProfile').invalid" matStepperNext mat-raised-button color="primary">
+										{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.NEXT' | translate}}
+									</button>
 								</div>
 							</ng-container>
 						</mat-step>