diff --git a/form.yml b/form.yml.erb
similarity index 84%
rename from form.yml
rename to form.yml.erb
index 65043161bad3ab9466e7e7328f8265fedc9be05e..6c7786ede4687a332c5e536cf92f03cf5b1b83c1 100644
--- a/form.yml
+++ b/form.yml.erb
@@ -1,9 +1,14 @@
+<%-
+  groups = OodSupport::User.new.groups.sort_by(&:id).tap { |groups|
+    groups.unshift(groups.delete(OodSupport::Process.group))
+  }.map(&:name).grep(/^P./)
+-%>
 ---
 cluster:
   - "owens"
 form:
   - version
-  - bc_account
+  - account
   - bc_num_hours
   - bc_num_slots
   - num_cores
@@ -25,9 +30,13 @@ attributes:
   bc_num_slots: "1"
   bc_vnc_resolution:
     required: true
-  bc_account:
+  account:
     label: "Project"
-    help: "You can leave this blank if **not** in multiple projects."
+    widget: select
+    options:
+      <%- groups.each do |group| %>
+      - "<%= group %>"
+      <%- end %>
   node_type:
     widget: select
     label: "Node type"
diff --git a/submit.yml.erb b/submit.yml.erb
index 475347e6b79f938c90374882720334017f0f6d95..e89017d8891b8cf42b243d773d4d3e7079d41cc1 100644
--- a/submit.yml.erb
+++ b/submit.yml.erb
@@ -17,6 +17,7 @@
 batch_connect:
   template: vnc
 script:
+  accounting_id: "<%= account %>"
   native:
   <%- slurm_args.each do |arg| %>
     - "<%= arg %>"