diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb
index 283aa9428..1681fb004 100644
--- a/app/controllers/management/proposals_controller.rb
+++ b/app/controllers/management/proposals_controller.rb
@@ -19,8 +19,8 @@ class Management::ProposalsController < Management::BaseController
       @proposal = Proposal.find(params[:id])
     end
 
-    def set_proposal_votes(proposals)
-      @proposal_votes = current_user ? current_user.proposal_votes(proposals) : {}
+    def proposal_params
+      params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :captcha, :captcha_key)
     end
 
     def current_user
diff --git a/app/views/management/proposals/new.html.erb b/app/views/management/proposals/new.html.erb
new file mode 100644
index 000000000..2641331a0
--- /dev/null
+++ b/app/views/management/proposals/new.html.erb
@@ -0,0 +1 @@
+<%= render template: 'proposals/new', form_url: management_proposals_url %>
\ No newline at end of file
diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb
index 40b0e5b52..4c14730fe 100644
--- a/app/views/proposals/_form.html.erb
+++ b/app/views/proposals/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_for(@proposal) do |f| %>
+<%= form_for(@proposal, url: form_url) do |f| %>
   <%= render 'shared/errors', resource: @proposal %>
 
   <div class="row">
diff --git a/app/views/proposals/edit.html.erb b/app/views/proposals/edit.html.erb
index 7d7ce413b..1ed03d533 100644
--- a/app/views/proposals/edit.html.erb
+++ b/app/views/proposals/edit.html.erb
@@ -12,6 +12,6 @@
 
     <h1><%= t("proposals.edit.editing") %></h1>
 
-    <%= render "form" %>
+    <%= render "form", form_url: proposal_url(@proposal) %>
   </div>
 </div>
diff --git a/app/views/proposals/new.html.erb b/app/views/proposals/new.html.erb
index 0bda9fd56..a24a31e77 100644
--- a/app/views/proposals/new.html.erb
+++ b/app/views/proposals/new.html.erb
@@ -11,7 +11,7 @@
         <%= t("proposals.new.more_info")%>
       <% end %>
     </div>
-    <%= render "form" %>
+    <%= render "proposals/form", form_url: proposals_url %>
   </div>
 
   <div class="small-12 medium-3 column">
diff --git a/config/routes.rb b/config/routes.rb
index afb421ac5..5b62b5494 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -169,7 +169,7 @@ Rails.application.routes.draw do
     get 'sign_in', to: 'sessions#create'
 
     resources :sessions, only: :create
-    resources :proposals, only: :index do
+    resources :proposals, only: [:index, :new, :create] do
       member do
         post :vote
       end