diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsForm.cshtml b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsForm.cshtml
index 620ea0a3..bfb2d8eb 100644
--- a/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsForm.cshtml
+++ b/src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsForm.cshtml
@@ -33,7 +33,14 @@
     {
         @if (Model.IframeEmbedded)
         {
-            <iframe frameBorder="0" style="width:100%;height:100%;" id=@id src="@Model.StandaloneUrl"></iframe>
+            if (!string.IsNullOrEmpty(Model.StandaloneUrl))
+            {
+                <iframe frameBorder="0" style="width:100%;height:100%;" id=@id src="@Model.StandaloneUrl"></iframe>
+            }
+            else
+            {
+                <iframe frameBorder="0" style="width:100%;height:100%;" id=@id srcdoc="@Model.Html"></iframe>
+            }
         }
         else
         {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs
index 63b82b04..7d425d96 100644
--- a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs
+++ b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs
@@ -66,7 +66,7 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
                 var form = _dynamicsService.GetRealTimeForm(jObject["id"].ToString()).ConfigureAwait(false).GetAwaiter().GetResult();
                 if (form != null)
                 {
-                    vm.Html = form.StandaloneHtml;
+                    vm.Html = form.StandaloneHtml ?? form.RawHtml;
                 }
             }