diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
deleted file mode 100644
index eb938c9b3..000000000
--- a/app/assets/javascripts/admin.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into admin.js
-// It will be included in the admin layout
-// and will require all the files listed below.
-//
-//= require admin_valuators_forms
-
-var initialize_admin_modules = function() {
-  App.AdminValuatorsForms.initialize();
-};
-
-$(function(){
-  $(document).ready(initialize_admin_modules);
-  $(document).on('page:load', initialize_admin_modules);
-  $(document).on('ajax:complete', initialize_admin_modules);
-});
diff --git a/app/assets/javascripts/admin_valuators_forms.js.coffee b/app/assets/javascripts/admin_valuators_forms.js.coffee
deleted file mode 100644
index 559d82e50..000000000
--- a/app/assets/javascripts/admin_valuators_forms.js.coffee
+++ /dev/null
@@ -1,17 +0,0 @@
-App.AdminValuatorsForms =
-
-  initialize: ->
-    $('#spending_proposal_administrator_id').unbind('change').on('change', ->
-      $('#administrator_assignment_form').submit()
-      false
-      )
-
-    $('#assign-valuators-link').unbind('click').on('click', ->
-      $('#valuators-assign-list').toggle("down")
-      false
-    )
-
-    $('.js-assign-valuators-check').unbind('change').on('change', ->
-      $('#valuators_assignment_form').submit()
-      false
-      )
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 98e378e69..aa27109d9 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -40,6 +40,7 @@
 //= require advanced_search
 //= require registration_form
 //= require suggest
+//= require forms
 
 var initialize_modules = function() {
   App.Comments.initialize();
@@ -55,6 +56,7 @@ var initialize_modules = function() {
   App.AdvancedSearch.initialize();
   App.RegistrationForm.initialize();
   App.Suggest.initialize();
+  App.Forms.initialize();
 };
 
 $(function(){
diff --git a/app/assets/javascripts/forms.js.coffee b/app/assets/javascripts/forms.js.coffee
new file mode 100644
index 000000000..a7d26cc02
--- /dev/null
+++ b/app/assets/javascripts/forms.js.coffee
@@ -0,0 +1,12 @@
+App.Forms =
+
+  initialize: ->
+    $('.js-submit-on-change').unbind('change').on('change', ->
+      $(this).closest('form').submit()
+      false
+      )
+
+    $('.js-toggle-link').unbind('click').on('click', ->
+      $($(this).data('toggle-selector')).toggle("down")
+      false
+    )
diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb
index a18a80f9e..008921ffe 100644
--- a/app/views/admin/spending_proposals/show.html.erb
+++ b/app/views/admin/spending_proposals/show.html.erb
@@ -31,7 +31,7 @@
 
 <p><strong><%= t("admin.spending_proposals.show.assigned_admin") %>:</strong>
    <%= form_for(@spending_proposal, url: assign_admin_admin_spending_proposal_path(@spending_proposal), remote: true, html: {id: 'administrator_assignment_form'}) do |f| %>
-     <%= f.select :administrator_id, @admins.collect { |a| [ "#{a.name} (#{a.email})", a.id ] }, {include_blank: t("admin.spending_proposals.show.undefined"), label: false} %>
+     <%= f.select :administrator_id, @admins.collect { |a| [ "#{a.name} (#{a.email})", a.id ] }, {include_blank: t("admin.spending_proposals.show.undefined"), label: false}, class: "js-submit-on-change" %>
    <% end %>
  </p>
 
@@ -40,7 +40,7 @@
   <%= render "assigned_valuators" %>
 </div>
 
-<h3><%= link_to t("admin.spending_proposals.show.assign_valuators"), "", id: "assign-valuators-link" %></h3>
+<h3><%= link_to t("admin.spending_proposals.show.assign_valuators"), "", class: "js-toggle-link", data: {"toggle-selector" => "#valuators-assign-list"} %></h3>
 
 <div style="display:none" id="valuators-assign-list">
   <%= form_for(@spending_proposal, url: assign_valuators_admin_spending_proposal_path(@spending_proposal), remote: true, html: {id: 'valuators_assignment_form'}) do |f| %>
@@ -48,7 +48,7 @@
       <div>
         <%= check_box_tag "valuator_ids_#{valuator.id}", valuator.id, @spending_proposal.valuators.include?(valuator),
                           name: 'spending_proposal[valuator_ids][]',
-                          class: "js-assign-valuators-check" %>
+                          class: "js-submit-on-change" %>
         <%= label_tag "valuator_ids_#{valuator.id}", valuator.name %>
       </div>
     <% end -%>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 6f338e8b5..012bea2ab 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -8,7 +8,7 @@
     <title><%= content_for?(:title) ? yield(:title) : "Admin" %></title>
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "vendor/modernizr" %>
-    <%= javascript_include_tag "application", "admin", 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
     <%= content_for :head %>
     <%= csrf_meta_tags %>
     <%= favicon_link_tag "favicon.ico" %>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 38f613094..a13ed5320 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -10,7 +10,6 @@ Rails.application.config.assets.version = '1.0'
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
 Rails.application.config.assets.precompile += %w( ckeditor/* )
-Rails.application.config.assets.precompile += %w( admin.js )
 Rails.application.config.assets.precompile += %w( ie_lt9.js )
 Rails.application.config.assets.precompile += %w( stat_graphs.js )
 Rails.application.config.assets.precompile += %w( print.css )