diff --git a/app/views/components/_autocomplete.html.erb b/app/views/components/_autocomplete.html.erb
index c50b54d10..95b64f49a 100644
--- a/app/views/components/_autocomplete.html.erb
+++ b/app/views/components/_autocomplete.html.erb
@@ -1,5 +1,5 @@
 <script type="application/javascript">
-  /* requires @usersEncoded and @users to be set, i.e. via retrieve_autocompletion_data! */
+  /* requires @usersEncoded and @users to be set, i.e. via Course.get_autocomplete_data */
   jQuery(function() {
     /* match user name/email with cud_id */
     /* escape_javascript prevents issues with backslashes in names, etc. */
diff --git a/app/views/submissions/new.html.erb b/app/views/submissions/new.html.erb
index 5b7dd3483..5abf269d9 100755
--- a/app/views/submissions/new.html.erb
+++ b/app/views/submissions/new.html.erb
@@ -1,7 +1,3 @@
-<% content_for :javascripts do %>
-  <%= render partial: "components/autocomplete", locals: { hiddenCUDField: "#submission_course_user_datum_id" } %>
-<% end %>
-
 <h2>Create Submission for <%= link_to @assessment.display_name, [@course, @assessment] %> </h2>
 
 <p>
@@ -26,6 +22,10 @@
   <td>
   <% if params[:course_user_datum_id].nil? then %>
 
+  <% content_for :javascripts do %>
+    <%= render partial: "components/autocomplete", locals: { hiddenCUDField: "#submission_course_user_datum_id" } %>
+  <% end %>
+
   <div class="input-field">
     <input type="text" size="3" id="student_autocomplete" class="autocomplete" autocomplete="off"/>
     <label for="student_autocomplete">Start typing student name or email</label>