diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Activities/FormSubmittedActivity.cs b/src/Orchard.Web/Modules/Orchard.CustomForms/Activities/FormSubmittedActivity.cs
index d0011a848..8b3dff07f 100644
--- a/src/Orchard.Web/Modules/Orchard.CustomForms/Activities/FormSubmittedActivity.cs
+++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Activities/FormSubmittedActivity.cs
@@ -27,13 +27,13 @@ namespace Orchard.CustomForms.Activities {
                     return true;
                 }
 
-                var content = workflowContext.Content;
+                var content = workflowContext.Tokens["CustomForm"] as ContentItem;
 
                 if (content == null) {
                     return false;
                 }
 
-                var contentManager = content.ContentItem.ContentManager;
+                var contentManager = content.ContentManager;
                 var identities = state.Split(',').Select(x => new ContentIdentity(x));
                 var customForms = identities.Select(contentManager.ResolveIdentity);
 
diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
index 8d8a43c43..67db9adaf 100644
--- a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
+++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
@@ -156,7 +156,7 @@ namespace Orchard.CustomForms.Controllers {
 
             // trigger any workflow
             _workflowManager.TriggerEvent(FormSubmittedActivity.EventName, contentItem,
-                    () => new Dictionary<string, object> { { "Content", contentItem } });
+                    () => new Dictionary<string, object> { { "Content", contentItem} , { "CustomForm", customForm.ContentItem } });
 
             if (customForm.Redirect) {
                 returnUrl = _tokenizer.Replace(customForm.RedirectUrl, new Dictionary<string, object> { { "Content", contentItem } });