diff --git a/app/controllers/cms/application_controller.rb b/app/controllers/cms/application_controller.rb
index 7e481b3c1..0ba6d1664 100644
--- a/app/controllers/cms/application_controller.rb
+++ b/app/controllers/cms/application_controller.rb
@@ -1,7 +1,5 @@
 module Cms
   class ApplicationController < ::ApplicationController
-    default_form_builder = Cms::FormBuilder::ContentBlockFormBuilder
     include Cms::AdminController
-
   end
 end
\ No newline at end of file
diff --git a/app/helpers/cms/form_tag_helper.rb b/app/helpers/cms/form_tag_helper.rb
index b1e8334e8..9a384426c 100644
--- a/app/helpers/cms/form_tag_helper.rb
+++ b/app/helpers/cms/form_tag_helper.rb
@@ -11,6 +11,13 @@ def content_block_form_for(object, *args, &block)
       simple_form_for(engine_aware_path(object), *(args << options.merge(builder: Cms::FormBuilder::ContentBlockFormBuilder)), &block)
     end
 
+    # Simple wrapper for Rails form_for that will use the CMS CustomFormBuilder.
+    # Can be used by portlets or other random public facing views to render content.
+    def cms_form_for(*args, &block)
+      options = args.extract_options!
+      options.merge!(:builder => Cms::FormBuilder::ContentBlockFormBuilder)
+      form_for(*(args + [options]), &block)
+    end
 
     def forecasting_a_new_section?(form_object)
       Cms::Section.with_path(form_object.object.class.path).first.nil?
diff --git a/app/views/portlets/email_page/render.html.erb b/app/views/portlets/email_page/render.html.erb
index 35190ce9a..eecc8f246 100644
--- a/app/views/portlets/email_page/render.html.erb
+++ b/app/views/portlets/email_page/render.html.erb
@@ -1,5 +1,5 @@
 <div class="email-page-portlet">
-  <%= form_for @email_message, :url => cms.portlet_handler_path(@portlet, "deliver"), :method=>'post' do |f| %>
+  <%= cms_form_for @email_message, :url => cms.portlet_handler_path(@portlet, "deliver"), :method=>'post' do |f| %>
     <%= hidden_field_tag :email_page_portlet_url, @email_page_portlet_url %>
     <%= f.cms_error_messages %>
     <p>