diff --git a/resource/web/event_config.tmpl b/resource/web/event_config.tmpl
index b8a71696..0e0aa8bc 100755
--- a/resource/web/event_config.tmpl
+++ b/resource/web/event_config.tmpl
@@ -25,7 +25,6 @@
                     <td>{{.getDeviceConfig()}}</td>
                     <td>
                         <form method="POST">
-                            <input type="hidden" name="action" value="remove_local_event">
                             <input type="hidden" name="id" value="{{.getId()}}">
 
                             <div class="btn-toolbar pull-right">
@@ -41,7 +40,7 @@
                                     <span class="glyphicon glyphicon-pencil"></span>
                                 </button>
 
-                                <button type="submit" class="btn btn-danger btn-xs">
+                                <button type="submit" class="btn btn-danger btn-xs" name="action" value="remove_local_event">
                                     <span class="glyphicon glyphicon-trash"></span>
                                 </button>
                             </div>
diff --git a/resource/web/sensor_config.tmpl b/resource/web/sensor_config.tmpl
index f5de4ca9..1b0833fb 100755
--- a/resource/web/sensor_config.tmpl
+++ b/resource/web/sensor_config.tmpl
@@ -27,7 +27,6 @@
                     <td>{{.getDeviceConfig()}}</td>
                     <td>
                         <form method="POST">
-                            <input type="hidden" name="action" value="remove_local_sensor">
                             <input type="hidden" name="id" value="{{.getId()}}">
 
                             <div class="btn-toolbar pull-right">
@@ -44,7 +43,7 @@
                                     <span class="glyphicon glyphicon-pencil"></span>
                                 </button>
 
-                                <button type="submit" class="btn btn-danger btn-xs">
+                                <button type="submit" class="btn btn-danger btn-xs" name="action" value="remove_local_sensor">
                                     <span class="glyphicon glyphicon-trash"></span>
                                 </button>
                             </div>
@@ -119,7 +118,6 @@
                     <td>{{.getPort()}}</td>
                     <td>
                         <form method="POST">
-                            <input type="hidden" name="action" value="remove_external_user">
                             <input type="hidden" name="id" value="{{.getId()}}">
 
                             <div class="btn-toolbar pull-right">
@@ -131,7 +129,7 @@
                                     <span class="glyphicon glyphicon-pencil"></span>
                                 </button>
 
-                                <button type="submit" class="btn btn-danger btn-xs">
+                                <button type="submit" class="btn btn-danger btn-xs" name="action" value="remove_external_user">
                                     <span class="glyphicon glyphicon-trash"></span>
                                 </button>
                             </div>
diff --git a/resource/web/trigger.tmpl b/resource/web/trigger.tmpl
index 1a9d08b3..1b90bda3 100755
--- a/resource/web/trigger.tmpl
+++ b/resource/web/trigger.tmpl
@@ -2,8 +2,7 @@
     Triggers
 
     <form class="pull-right" method="POST">
-        <input type="hidden" name="action" value="create_flow" />
-        <button type="submit" class="btn btn-default">
+        <button type="submit" class="btn btn-default" name="action" value="create_flow">
             <span class="glyphicon glyphicon-plus"></span>
         </button>
     </form>
@@ -15,10 +14,9 @@
     <div class="panel panel-default drop-shadow">
         <div class="panel-heading clearfix">
             <form method="POST">
-                <input type="hidden" name="action" value="remove_flow">
                 <input type="hidden" name="flow-id" value="{{.getId()}}">
                 <div class="btn-toolbar pull-right">
-                    <button type="submit" class="btn btn-danger btn-xs" style="padding: 1px 20px;">
+                    <button type="submit" class="btn btn-danger btn-xs" style="padding: 1px 20px;" name="action" value="remove_flow">
                         <span class="glyphicon glyphicon-trash"></span>
                     </button>
                 </div>
@@ -54,7 +52,6 @@
                                     <div class="panel-heading" style="padding: 2px 15px;">
                                         <small>{{.getObjectClass()}}</small>
                                         <form method="POST">
-                                            <input type="hidden" name="action" value="remove_trigger">
                                             <input type="hidden" name="trigger-id" value="{{.getId()}}">
 
                                             <div class="btn-toolbar pull-right">
@@ -68,7 +65,7 @@
                                                         {{/.getObjectConfigurator().getConfiguration()}} >
                                                     <span class="glyphicon glyphicon-pencil"></span>
                                                 </button>
-                                                <button type="submit" class="btn btn-danger btn-xs">
+                                                <button type="submit" class="btn btn-danger btn-xs" name="action" value="remove_trigger">
                                                     <span class="glyphicon glyphicon-trash"></span>
                                                 </button>
                                             </div>
@@ -97,7 +94,6 @@
                                     <div class="panel-heading" style="padding: 2px 15px;">
                                         <small>{{.getObjectClass()}}</small>
                                         <form method="POST">
-                                            <input type="hidden" name="action" value="remove_action">
                                             <input type="hidden" name="action-id" value="{{.getId()}}">
 
                                             <div class="btn-toolbar pull-right">
@@ -111,7 +107,7 @@
                                                         {{/.getObjectConfigurator().getConfiguration()}} >
                                                 <span class="glyphicon glyphicon-pencil"></span>
                                                 </button>
-                                                <button type="submit" class="btn btn-danger btn-xs">
+                                                <button type="submit" class="btn btn-danger btn-xs" name="action" value="remove_action">
                                                     <span class="glyphicon glyphicon-trash"></span>
                                                 </button>
                                             </div>