diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DmpQuickWizardModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DmpQuickWizardModel.java
index 93aa43722..d67f9724b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DmpQuickWizardModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DmpQuickWizardModel.java
@@ -101,6 +101,8 @@ public class DmpQuickWizardModel {
 		dataManagementPlanEntity.setAssociatedUsers(user);
 		dataManagementPlanEntity.setExtraProperties(new HashMap<>());
 		dataManagementPlanEntity.getExtraProperties().put("language", this.language);
+		dataManagementPlanEntity.getExtraProperties().put("visible", false);
+		dataManagementPlanEntity.getExtraProperties().put("contact", principal.getId().toString());
 		return dataManagementPlanEntity;
 	}
 
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
index 25f661180..74de57de3 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
@@ -228,6 +228,8 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 					this.dmp.project = new ProjectFormModel();
 					this.dmp.funder = new FunderFormModel();
 					this.dmp.extraProperties = new ExtraPropertiesFormModel();
+					this.dmp.extraProperties.visible = false;
+					this.dmp.extraProperties.contact = this.authService.current().id;
 					this.formGroup = this.dmp.buildForm();
 					this.registerFormEventsForNewItem();
 					if (this.isAuthenticated) {
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
index 5bf058928..b93a16750 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
@@ -23,8 +23,8 @@ import { DmpUploadDialogue } from './upload-dialogue/dmp-upload-dialogue.compone
 import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service';
 import { isNullOrUndefined } from 'util';
 import { AuthService } from '@app/core/services/auth/auth.service';
-import { DmpCriteriaDialogComponent } from './criteria/dmp-criteria-dialog.component';
 import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
+import { DmpCriteriaDialogComponent } from './criteria/dmp-criteria-dialog.component';
 
 
 @Component({
@@ -250,6 +250,10 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 
 	getDefaultCriteria(): DmpCriteria {
 		const defaultCriteria = new DmpCriteria();
+		if (this.isPublic) {
+			defaultCriteria.isPublic = true;
+			defaultCriteria.onlyPublic = true;
+		}
 		return defaultCriteria;
 	}