diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index 3d4670252..bf1d807bf 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -215,6 +215,7 @@ label.entity-id=Entity ID
 label.service-provider-name=Service Provider Name
 label.organization=Organization
 label.contacts=Contacts
+label.contact=Contact
 label.mdui=MDUI Information
 label.service-provider-sso-descriptor=Service Provider Sso Descriptor
 label.service-enabled=Service Enabled
diff --git a/backend/src/main/resources/metadata-sources-ui-schema.json b/backend/src/main/resources/metadata-sources-ui-schema.json
index c06e299a6..e2a2298dd 100644
--- a/backend/src/main/resources/metadata-sources-ui-schema.json
+++ b/backend/src/main/resources/metadata-sources-ui-schema.json
@@ -370,6 +370,7 @@
     },
     "definitions": {
         "Contact": {
+            "title": "label.contact",
             "type": "object",
             "required": [
                 "name",
diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts
index 8f8caca24..e6577886d 100644
--- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts
+++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts
@@ -72,7 +72,7 @@ export class DashboardResolversListComponent implements OnInit {
 
     edit(entity: MetadataEntity): void {
         if (entity.isDraft()) {
-            this.router.navigate(['metadata', 'resolver', 'new'], {
+            this.router.navigate(['metadata', 'resolver', 'new', 'blank', 'org-info'], {
                 queryParams: {
                     id: entity.getId()
                 }
diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.ts b/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.ts
index 0021727b2..566291404 100644
--- a/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.ts
+++ b/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
-import { withLatestFrom, map, distinctUntilChanged, skipWhile } from 'rxjs/operators';
+import { withLatestFrom, map, distinctUntilChanged, skipWhile, filter } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 
 import * as fromResolver from '../reducer';
@@ -60,7 +60,7 @@ export class ResolverWizardStepComponent implements OnDestroy {
                 },
                 definition
             })),
-            skipWhile(({ model, definition }) => !definition || !model),
+            filter(({ model, definition }) => (definition && model)),
             map(({ model, definition }) => definition.formatter(model))
         );
 
@@ -76,7 +76,7 @@ export class ResolverWizardStepComponent implements OnDestroy {
 
         this.valueChangeEmitted$.pipe(
             withLatestFrom(this.definition$),
-            skipWhile(([ changes, definition ]) => !definition || !changes),
+            filter(([ changes, definition ]) => (!!definition && !!changes)),
             map(([ changes, definition ]) => definition.parser(changes.value)),
             withLatestFrom(this.store.select(fromResolver.getSelectedDraft)),
             map(([changes, original]) => ({ ...original, ...changes }))
diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts b/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts
index ba2221fda..d6cac6053 100644
--- a/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts
+++ b/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts
@@ -26,9 +26,8 @@ import { SetDefinition, SetIndex, SetDisabled, ClearWizard } from '../../../wiza
 import * as fromWizard from '../../../wizard/reducer';
 import { LoadSchemaRequest } from '../../../wizard/action/wizard.action';
 import { UnsavedEntityComponent } from '../../domain/component/unsaved-entity.dialog';
-import { ModalService } from '../../../core/service/modal.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { UpdateChanges, Clear } from '../action/entity.action';
+import { Clear } from '../action/entity.action';
 
 @Component({
     selector: 'resolver-wizard-page',
@@ -172,7 +171,7 @@ export class ResolverWizardComponent implements OnDestroy, CanComponentDeactivat
         currentState: RouterStateSnapshot,
         nextState: RouterStateSnapshot
     ): Observable<boolean> {
-        if (nextState.url.match('blank')) { return of(true); }
+        if (nextState.url.match('blank') && !!nextState.root.queryParams.id) { return of(true); }
         if (Object.keys(this.changes).length > 0) {
             let modal = this.modalService.open(UnsavedEntityComponent);
             modal.componentInstance.message = 'resolver';
diff --git a/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts b/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
index 024c923eb..f6e203381 100644
--- a/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
+++ b/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
@@ -120,7 +120,7 @@ export class DraftCollectionEffects {
                 )
         ),
         tap(() => {
-            this.store.dispatch(new ClearWizard());
+            // this.store.dispatch(new ClearWizard());
             this.store.dispatch(new Clear());
         })
     );
diff --git a/ui/src/app/wizard/component/wizard.component.html b/ui/src/app/wizard/component/wizard.component.html
index 4f5a6e5c6..c3612bec2 100644
--- a/ui/src/app/wizard/component/wizard.component.html
+++ b/ui/src/app/wizard/component/wizard.component.html
@@ -1,4 +1,4 @@
-<nav *ngIf="index$ | async">
+<nav *ngIf="(current$ | async) && (index$ | async)">
     <ul class="nav nav-wizard">
         <li class="nav-item" *ngIf="(previous$ | async)">
             <button class="nav-link previous btn clearfix" (click)="onPrevious.emit(previousPage.index)" [disabled]="disabled$ | async"