diff --git a/resource/web/event_detail.tmpl b/resource/web/event_detail.tmpl
index 4a276695..61288337 100755
--- a/resource/web/event_detail.tmpl
+++ b/resource/web/event_detail.tmpl
@@ -23,6 +23,21 @@
                     <th class="text-right">Owner:</th>
                     <td>{{event.getUser().getUsername()}} <p></td>
                 </tr>
+                <tr>
+                    <th class="text-right">State:</th>
+                    <td>
+                        <form method="POST">
+                            <input type="hidden" name="action" value="modify">
+                            <input type="hidden" name="action_id" value="{{.getId()}}">
+
+                            <div class="btn-toolbar pull-left">
+                                <input class="toggle-switch" type="checkbox" name="enabled"
+                                       data-size="mini" data-on-color="danger"
+                                       {{event.getDeviceData().getData()}}checked{{/event.getDeviceData().getData()}} >
+                            </div>
+                        </form>
+                    </td>
+                </tr>
                 {{#event.getDeviceConfigurator().getConfiguration()}}
                 <tr>
                     <th class="text-right">{{.getNiceName()}}:</th>
@@ -54,3 +69,11 @@
         </div>
     </div>
 </div>
+
+<script>
+    $(function (){
+        $(".toggle-switch").on("switchChange.bootstrapSwitch", function (event, state) {
+            $(this).closest('form').submit();
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/resource/web/event_overview.tmpl b/resource/web/event_overview.tmpl
index c594681b..88ed5852 100755
--- a/resource/web/event_overview.tmpl
+++ b/resource/web/event_overview.tmpl
@@ -22,7 +22,7 @@
                     <td>
                         <form method="POST">
                             <input type="hidden" name="action" value="modify">
-                            <input type="hidden" name="id" value="{{.getId()}}">
+                            <input type="hidden" name="action_id" value="{{.getId()}}">
 
                             <div class="btn-toolbar pull-right">
                                 <input class="toggle-switch" type="checkbox" name="enabled"
diff --git a/src/se/hal/page/EventOverviewHttpPage.java b/src/se/hal/page/EventOverviewHttpPage.java
index 53c6a6dd..860691cc 100755
--- a/src/se/hal/page/EventOverviewHttpPage.java
+++ b/src/se/hal/page/EventOverviewHttpPage.java
@@ -39,20 +39,24 @@ public class EventOverviewHttpPage extends HalHttpPage {
             throws Exception{
 
         DBConnection db = HalContext.getDB();
-        int id = (request.containsKey("id") ? Integer.parseInt(request.get("id")) : -1);
 
         if(request.containsKey("action")){
+            int id = (request.containsKey("action_id") ? Integer.parseInt(request.get("action_id")) : -1);
+
             // change event data
             SwitchEventData eventData = new SwitchEventData();
-            if ( request.containsKey("enabled") && "on".equals(request.get("enabled")))
+            if (request.containsKey("enabled") && "on".equals(request.get("enabled")))
                 eventData.turnOn();
             else
                 eventData.turnOff();
+
             Event event = Event.getEvent(db, id);
             event.setDeviceData(eventData);
             ControllerManager.getInstance().send(event);
         }
 
+        int id = (request.containsKey("id") ? Integer.parseInt(request.get("id")) : -1);
+
         // Save new input
         if(!request.containsKey("action") && id >= 0){
             Event event = Event.getEvent(db, id);