diff --git a/templates/front/filtering_rules_modal.html b/templates/front/filtering_rules_modal.html
index cb6a9e6a..3e068fda 100644
--- a/templates/front/filtering_rules_modal.html
+++ b/templates/front/filtering_rules_modal.html
@@ -67,9 +67,10 @@
                             <input
                                 name="subject"
                                 type="text"
+                                maxlength="100"
                                 value="{{ check.subject }}"
                                 {% if not check.subject and not check.subject_fail %}disabled{% endif %}
-                                class="input-name form-control filter-by-subject" />
+                                class="form-control filter-by-subject" />
                             <span class="help-block">
                                 Comma-separated list of keywords. If Subject contains
                                 any of the keywords, treat it as "success".
@@ -84,9 +85,10 @@
                             <input
                                 name="subject_fail"
                                 type="text"
+                                maxlength="100"
                                 value="{{ check.subject_fail }}"
                                 {% if not check.subject and not check.subject_fail %}disabled{% endif %}
-                                class="input-name form-control filter-by-subject" />
+                                class="form-control filter-by-subject" />
                             <span class="help-block">
                                 Comma-separated list of keywords. If Subject contains
                                 any of the keywords, treat it as "failure".
diff --git a/templates/front/update_name_modal.html b/templates/front/update_name_modal.html
index c38e2ea3..faf533d9 100644
--- a/templates/front/update_name_modal.html
+++ b/templates/front/update_name_modal.html
@@ -24,7 +24,7 @@
                                 maxlength="100"
                                 value="{{ check.name }}"
                                 placeholder="unnamed"
-                                class="input-name form-control" />
+                                class="form-control" />
 
                             <span class="help-block">
                                 Give this check a human-friendly name,