diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index e3f25d52e..7813b1ddb 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -124,7 +124,7 @@ buttonField btn = Field {fieldParse, fieldView, fieldEnctype}
 
     fieldView fid name attrs _val _ =
       [whamlet|
-        <input .#{bcc2txt $ cssClass btn} type=submit name=#{name} value=^{toPathPiece btn} data-label=^{label btn} *{attrs} ##{fid}>
+        <button .btn .#{bcc2txt $ cssClass btn} type=submit name=#{name} value=#{toPathPiece btn} *{attrs} ##{fid}>^{label btn}
       |]
 
     fieldParse []    _ = return $ Right Nothing
diff --git a/templates/standalone/inputs.julius b/templates/standalone/inputs.julius
index 8e392e6a0..10a32bd18 100644
--- a/templates/standalone/inputs.julius
+++ b/templates/standalone/inputs.julius
@@ -174,15 +174,4 @@ document.addEventListener('DOMContentLoaded', function() {
       label.classList.remove('reactive-label');
     }
   });
-
-  // add button-labels from dataset
-  Array.from(document.querySelectorAll('input[data-label]')).map(function(btn) {
-
-    btn.dataset.value = btn.getAttribute('value');
-    var parser = new DOMParser;
-    var dom = parser.parseFromString(btn.dataset.label, 'text/html');
-    var decodedString = dom.body.innerHTML;
-    console.log(dom.body.innerHTML);
-    btn.value = decodedString;
-  });
 });