diff --git a/app/views/assessments/_edit_handin.html.erb b/app/views/assessments/_edit_handin.html.erb
index ac249c0a3..4e4dc931e 100644
--- a/app/views/assessments/_edit_handin.html.erb
+++ b/app/views/assessments/_edit_handin.html.erb
@@ -1,5 +1,22 @@
 <% content_for :javascripts do %>
   <%= javascript_include_tag "init_handin_datetimepickers" %>
+  <script>
+      function toggleHandinAutolab(disable_button) {
+          const handinField = document.querySelector('.handin-filename-field');
+          handinField.disabled = disable_button.checked;
+          if (!handinField.disabled && !handinField.value) {
+              handinField.value = 'handin.c';
+          }
+      }
+
+      document.addEventListener('DOMContentLoaded', function() {
+          const disableHandinsCheckbox = document.querySelector('.disable-handins-toggle');
+          toggleHandinAutolab(disableHandinsCheckbox);
+          disableHandinsCheckbox.addEventListener('change', function() {
+              toggleHandinAutolab(disableHandinsCheckbox);
+          });
+      });
+  </script>
 <% end %>
 <%# Initialize datepickers by defining linked relationships (using IDs) %>
 <%= f.datetime_select :start_at,
@@ -29,14 +46,19 @@
                   help_text: "Autolab has not been configured to use Github integration. Please contact your
   Autolab admin to perform the necessary setup and configuration based on the instructions on our docs." %>
 <% end %>
-<% unless f.object.disable_handins %>
-  <%= f.text_field :handin_filename, help_text: "The suffix that is appended to student submission files.
-    Autolab stores submission files in the handin directory as email/version_fname", placeholder: "E.g. mm.c" %>
-<% end %>
-<%= f.text_field :max_size, help_text: "The maximum size that a handin file can have in megabytes (MB)." %>
 <%= f.check_box :disable_handins,
-                help_text: "Check this to disallow handins through Autolab. This option can be used to track scores
-  for assignments that are not submitted through Autolab such as midterms and written assignments." %>
+                display_name: "Disable Autolab submissions",
+                help_text: "Check this to disallow handins through Autolab. This option can be used to track scores for assignments that are not submitted through Autolab such as midterms and written assignments.",
+                class: "disable-handins-toggle",
+                onchange: "toggleHandinAutolab(this)" %>
+<%= f.text_field :handin_filename,
+                 value: f.object.handin_filename.presence || "handin.c",
+                 help_text: "The suffix that is appended to student submission files. Autolab stores submission files in the handin directory as email/version_fname",
+                 placeholder: "E.g. mm.c",
+                 class: "handin-filename-field",
+                 pattern: "^[a-zA-Z0-9._]+$",
+                 title: "Only alphanumeric characters, dots, and underscores are allowed." %>
+<%= f.text_field :max_size, help_text: "The maximum size that a handin file can have in megabytes (MB)." %>
 
 <div class="action_buttons">
   <%= f.submit "Save", name: "handin" %>
diff --git a/app/views/assessments/show.html.erb b/app/views/assessments/show.html.erb
index 8d97ece57..6738afc1e 100755
--- a/app/views/assessments/show.html.erb
+++ b/app/views/assessments/show.html.erb
@@ -181,7 +181,7 @@
         <div class="card-content">
           <p class="valign-wrapper">
             <i class="material-icons valign">file_upload_off</i>
-            <b class="red-text">&nbsp;Handins are disabled for this assessment.</b>
+            <b class="red-text">&nbsp;Autolab handins are disabled for this assessment.</b>
           </p>
         </div>
       </div>