diff --git a/plugins/custom_forms/lib/custom_forms_plugin/text_field.rb b/plugins/custom_forms/lib/custom_forms_plugin/text_field.rb
index e923030..9524a81 100644
--- a/plugins/custom_forms/lib/custom_forms_plugin/text_field.rb
+++ b/plugins/custom_forms/lib/custom_forms_plugin/text_field.rb
@@ -1,5 +1,3 @@
 class CustomFormsPlugin::TextField < CustomFormsPlugin::Field
   set_table_name :custom_forms_plugin_fields
-
-  attr_accessible :name
 end
diff --git a/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb b/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
index 7bb6187..edd1ddd 100644
--- a/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
+++ b/plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
@@ -23,7 +23,7 @@
 <h2><%= _('Fields') %></h2>
 
 <ul class='field-list'>
-  <% f.fields_for :fields do |builder| %>
+  <%= f.fields_for :fields do |builder| %>
     <li>
       <%= render partial_for_class(builder.object.class), :f => builder %>
     </li>
diff --git a/plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_select_field.html.erb b/plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_select_field.html.erb
index b45e4cd..95e1d4e 100644
--- a/plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_select_field.html.erb
+++ b/plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_select_field.html.erb
@@ -27,7 +27,7 @@
     </tr>
     </tfoot>
     <tbody class='field-list'>
-    <% f.fields_for :alternatives do |builder| %>
+    <%= f.fields_for :alternatives do |builder| %>
       <%= render partial_for_class(builder.object.class), :f => builder %>
     <% end %>
     </tbody>
diff --git a/plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb b/plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb
index 99e0086..d03a0dd 100644
--- a/plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb
+++ b/plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb
@@ -30,7 +30,7 @@
 
   <% end %>
 <% else %>
-  <% fields_for :submission, @submission do |f| %>
+  <%= fields_for :submission, @submission do |f| %>
     <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
   <% end %>
 <% end %>
diff --git a/plugins/custom_forms/views/tasks/custom_forms_plugin/_membership_survey_accept_details.html.erb b/plugins/custom_forms/views/tasks/custom_forms_plugin/_membership_survey_accept_details.html.erb
index 87fac78..4cee244 100644
--- a/plugins/custom_forms/views/tasks/custom_forms_plugin/_membership_survey_accept_details.html.erb
+++ b/plugins/custom_forms/views/tasks/custom_forms_plugin/_membership_survey_accept_details.html.erb
@@ -1,5 +1,5 @@
 <% @form = CustomFormsPlugin::Form.find(task.form_id) %>
-<% @submission = CustomFormsPlugin::Submission.new(:form_id => @form.id, :profile_id => user.id) %>
+<% @submission = CustomFormsPlugin::Submission.new(:form => @form, :profile => user) %>
 
 <h2><%= @form.name %></h2>
 <p><%= @form.description %></p>
@@ -11,6 +11,6 @@
   <% end %>
 <% end %>
 
-<% f.fields_for :submission do |fi| %>
+<%= f.fields_for :submission do |fi| %>
   <%= render :partial => 'shared/form_submission', :locals => {:f => fi} %>
 <% end %>
--
libgit2 0.21.2