diff --git a/homeassistant/components/http/frontend.py b/homeassistant/components/http/frontend.py
index 600b21cf8d765c9b6faa0f4c17a9d6400d1bf624..cb038c2485fb99330a0f38d199559b647fab2668 100644
--- a/homeassistant/components/http/frontend.py
+++ b/homeassistant/components/http/frontend.py
@@ -1,2 +1,2 @@
 """ DO NOT MODIFY. Auto-generated by build_frontend script """
-VERSION = "eed02673a7e36fe85f2fa021373d0156"
+VERSION = "560228cee9ffd6de4dfdb5816b2f9a23"
diff --git a/homeassistant/components/http/www_static/frontend.html b/homeassistant/components/http/www_static/frontend.html
index 6eedd9f40400338e8361f9f86d37d1edabd9d4bd..7c071498a546815a6d170573ec79eb63a517b9d3 100644
--- a/homeassistant/components/http/www_static/frontend.html
+++ b/homeassistant/components/http/www_static/frontend.html
@@ -19139,7 +19139,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     clickFireEvent: function() {
       this.api.fire_event(
         this.$.inputType.value,
-        this.$.inputData.value
+        JSON.parse(this.$.inputData.value)
         )
     }
   });
@@ -19861,7 +19861,7 @@ core-item {
       this.api.call_service(
         this.$.inputDomain.value,
         this.$.inputService.value,
-        this.$.inputData.value
+        JSON.parse(this.$.inputData.value)
         )
     }
   });
@@ -20281,8 +20281,6 @@ core-item {
     },
 
     fire_event: function(eventType, eventData) {
-      eventData = eventData ? JSON.parse(eventData) : "";
-
       var successToast = function() {
         this.showToast("Event "+eventType+" fired.");
       }
diff --git a/homeassistant/components/http/www_static/polymer/event-fire-dialog.html b/homeassistant/components/http/www_static/polymer/event-fire-dialog.html
index dff309b6b077b19bf694c4edd0adb41cfa5fa5d9..28711006bc2c1b33bdfde7e4b7f04389b9a737cf 100644
--- a/homeassistant/components/http/www_static/polymer/event-fire-dialog.html
+++ b/homeassistant/components/http/www_static/polymer/event-fire-dialog.html
@@ -70,7 +70,7 @@
     clickFireEvent: function() {
       this.api.fire_event(
         this.$.inputType.value,
-        this.$.inputData.value
+        JSON.parse(this.$.inputData.value)
         )
     }
   });
diff --git a/homeassistant/components/http/www_static/polymer/home-assistant-api.html b/homeassistant/components/http/www_static/polymer/home-assistant-api.html
index 67adc93efbb3223d3d79c78ff95955a7c9572da9..169c97d5cb7ff58b87690555091f7e3831d4756d 100644
--- a/homeassistant/components/http/www_static/polymer/home-assistant-api.html
+++ b/homeassistant/components/http/www_static/polymer/home-assistant-api.html
@@ -270,8 +270,6 @@
     },
 
     fire_event: function(eventType, eventData) {
-      eventData = eventData ? JSON.parse(eventData) : "";
-
       var successToast = function() {
         this.showToast("Event "+eventType+" fired.");
       }
diff --git a/homeassistant/components/http/www_static/polymer/service-call-dialog.html b/homeassistant/components/http/www_static/polymer/service-call-dialog.html
index fce95b77a72cfdef8bf09adb7cc17648297ce0b6..e226e5f279cb77dc0f7d591eb1dd4321e50e8d59 100644
--- a/homeassistant/components/http/www_static/polymer/service-call-dialog.html
+++ b/homeassistant/components/http/www_static/polymer/service-call-dialog.html
@@ -68,7 +68,7 @@
       this.api.call_service(
         this.$.inputDomain.value,
         this.$.inputService.value,
-        this.$.inputData.value
+        JSON.parse(this.$.inputData.value)
         )
     }
   });