diff --git a/platform/commonUI/dialog/res/templates/overlay.html b/platform/commonUI/dialog/res/templates/overlay.html
index bae3b906d9..e29dd523f5 100644
--- a/platform/commonUI/dialog/res/templates/overlay.html
+++ b/platform/commonUI/dialog/res/templates/overlay.html
@@ -12,7 +12,10 @@
             <div class="abs form outline editor">
                 <div class='abs contents'>
                     <!-- mct-include key="'form'" ng-model="" -->
-                    <textarea ng-model="ngModel.value"></textarea>
+                    <mct-form ng-model="ngModel.value"
+                              structure="ngModel.structure"
+                              name="createForm">
+                    </mct-form>
                 </div>
             </div>
             <div class="abs bottom-bar">
diff --git a/platform/commonUI/dialog/src/DialogService.js b/platform/commonUI/dialog/src/DialogService.js
index 7bd44dcf7d..b606c1743e 100644
--- a/platform/commonUI/dialog/src/DialogService.js
+++ b/platform/commonUI/dialog/src/DialogService.js
@@ -1,4 +1,4 @@
-/*global define,Promise*/
+/*global define*/
 
 /**
  * Module defining DialogService. Created by vwoeltje on 11/10/14.
@@ -36,14 +36,8 @@ define(
                 // overlay-dialog template and associated with a
                 // OK button click
                 function confirm() {
-                    var resultingValue;
-
-                    // Temporary workaround, in the absence of a
-                    // forms package.
-                    resultingValue = JSON.parse(overlayModel.value);
-
                     // Pass along the result
-                    deferred.resolve(resultingValue);
+                    deferred.resolve(overlayModel.value);
 
                     // Stop showing the dialog
                     dismiss();
@@ -73,8 +67,8 @@ define(
                     overlayModel = {
                         title: formModel.name,
                         message: formModel.message,
-                        formModel: formModel,
-                        value: JSON.stringify(value),
+                        structure: formModel,
+                        value: value,
                         confirm: confirm,
                         cancel: cancel
                     };