diff --git a/src/demo/app/properties.dialog.component.html b/src/demo/app/properties.dialog.component.html
index de1ea53..4873bcd 100644
--- a/src/demo/app/properties.dialog.component.html
+++ b/src/demo/app/properties.dialog.component.html
@@ -5,7 +5,7 @@
   </button>
 </div>
 <div class="modal-body">
-  <properties-group *ngIf="propertiesGroupModel" [propertiesGroupModel]="propertiesGroupModel" (form)="propertiesFormGroup=$event"></properties-group>
+  <properties-group *ngIf="propertiesGroupModel" [propertiesGroupModel]="propertiesGroupModel" [form]="propertiesFormGroup"></properties-group>
 </div>
 <div class="modal-footer">
   <button type="button" class="btn btn-default" (click)="handleCancel()">Close</button>
diff --git a/src/demo/app/properties.dialog.component.ts b/src/demo/app/properties.dialog.component.ts
index 537627f..835bcb4 100644
--- a/src/demo/app/properties.dialog.component.ts
+++ b/src/demo/app/properties.dialog.component.ts
@@ -17,7 +17,9 @@ export class PropertiesDialogComponent {
 
   propertiesFormGroup : FormGroup;
 
-  constructor(private bsModalRef: BsModalRef) {}
+  constructor(private bsModalRef: BsModalRef) {
+    this.propertiesFormGroup = new FormGroup({});
+  }
 
   handleOk() {
     this.propertiesGroupModel.applyChanges();
diff --git a/src/lib/src/properties/properties.group.component.ts b/src/lib/src/properties/properties.group.component.ts
index f000192..6e4cd04 100644
--- a/src/lib/src/properties/properties.group.component.ts
+++ b/src/lib/src/properties/properties.group.component.ts
@@ -12,13 +12,10 @@ export class PropertiesGroupComponent implements OnInit {
   @Input()
   propertiesGroupModel : Properties.PropertiesGroupModel;
 
+  @Input()
   form : FormGroup;
 
-  @Output('form')
-  private formEventEmitter = new EventEmitter<FormGroup>();
-
   ngOnInit() {
-    this.form = new FormGroup({});
     if (this.propertiesGroupModel.isLoading) {
       let subscription = this.propertiesGroupModel.loadedSubject.subscribe(loaded => {
         if (loaded) {
@@ -29,7 +26,6 @@ export class PropertiesGroupComponent implements OnInit {
     } else {
       this.createGroupControls();
     }
-    this.formEventEmitter.emit(this.form);
   }
 
   createGroupControls() {