diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index 5da1c6a02..b38d37ed6 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -6,7 +6,6 @@ $case formLayout
       <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
         $if not (Blaze.null $ fvLabel view)
           <label .form-group__label for=#{fvId view}>#{fvLabel view}
-        $# TODO: inputs should have proper placeholders
         <div .form-group__input>
           $# FIXME: file-input does not have `required` attribute, although set on form-group
           ^{fvInput view}
diff --git a/templates/widgets/form.julius b/templates/widgets/form.julius
index 994f1bece..21d6799ee 100644
--- a/templates/widgets/form.julius
+++ b/templates/widgets/form.julius
@@ -3,23 +3,25 @@
 
   window.utils = window.utils || {};
 
-  // registers input-listener for each element in <elements> (array) and
-  // enables <button> if <validation> for these elements returns true
-  window.utils.reactiveButton = function(elements, button, validation) {
-    if (elements.length == 0) {
+  // registers input-listener for each element in <inputs> (array) and
+  // enables <button> if <validation> for these inputs returns true
+  window.utils.reactiveButton = function(form, button, validation) {
+    var requireds = Array.from(form.querySelectorAll('[required]'));
+    if (requireds.length == 0) {
       return false;
     }
-    var checkboxes = elements[0].getAttribute('type') === 'checkbox';
-    var eventType = checkboxes ? 'change' : 'input';
     updateButtonState();
-    elements.forEach(function(el) {
+
+    requireds.forEach(function(el) {
+      var checkbox = el.getAttribute('type') === 'checkbox';
+      var eventType = checkbox ? 'change' : 'input';
       el.addEventListener(eventType, function() {
         updateButtonState();
       });
     });
 
     function updateButtonState() {
-      if (validation.call(null, elements) === true) {
+      if (validation.call(null, requireds) === true) {
         button.removeAttribute('disabled');
       } else {
         button.setAttribute('disabled', 'true');
@@ -33,19 +35,21 @@ document.addEventListener('DOMContentLoaded', function() {
   // auto reactiveButton submit-buttons with required fields
   var forms = document.querySelectorAll('form');
   Array.from(forms).forEach(function(form) {
-    var requireds = form.querySelectorAll('[required]');
     var submitBtn = form.querySelector('[type=submit]');
-    if (submitBtn && requireds) {
-      window.utils.reactiveButton(Array.from(requireds), submitBtn, function validateForm(inputs) {
-        var done = true;
-        inputs.forEach(function(inp) {
-          var len = inp.value.trim().length;
-          if (done && len === 0) {
-            done = false;
-          }
-        });
-        return done;
-      });
+    if (submitBtn) {
+      window.utils.reactiveButton(form, submitBtn, validateForm);
     }
   });
+
+  function validateForm(inputs) {
+    var done = true;
+    inputs.forEach(function(inp) {
+      var len = inp.value.trim().length;
+      if (done && len === 0) {
+        done = false;
+      }
+    });
+    return done;
+  }
+
 });