diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 28da1978a..a82e12944 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1124,6 +1124,7 @@ class e_form
 	function submit($name, $value, $options = array())
 	{
 		$options = $this->format_options('submit', $name, $options);
+		$options['class'] = vartrue($options['class'],'button btn');
 		return "<input type='submit' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
 	}