diff --git a/lib/classes/output/class.htmlform.php b/lib/classes/output/class.htmlform.php
index 62c3db8c..53733e81 100644
--- a/lib/classes/output/class.htmlform.php
+++ b/lib/classes/output/class.htmlform.php
@@ -87,7 +87,10 @@ class htmlform
 				}
 			}
 		}
-		
+
+		// add save/reset buttons at the end of the form
+		eval("self::\$_form .= \"" . getTemplate("misc/form/table_end", "1") . "\";");
+
 		return self::$_form;
 	}
 
diff --git a/templates/Classic/misc/form/table_end.tpl b/templates/Classic/misc/form/table_end.tpl
new file mode 100644
index 00000000..a79d9bea
--- /dev/null
+++ b/templates/Classic/misc/form/table_end.tpl
@@ -0,0 +1,5 @@
+<tr>
+	<td colspan="2" class="maintitle_apply_right" nowrap="nowrap">
+		<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
+	</td>
+</tr>
diff --git a/templates/Froxlor/misc/form/table_end.tpl b/templates/Froxlor/misc/form/table_end.tpl
new file mode 100644
index 00000000..4056f237
--- /dev/null
+++ b/templates/Froxlor/misc/form/table_end.tpl
@@ -0,0 +1,6 @@
+<tr>
+	<td colspan="2" style="text-align:right;">
+		<input type="reset" value="{$lng['panel']['reset']}" />
+		<input type="submit" value="{$lng['panel']['save']}" />
+	</td>
+</tr>