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 e08c57d4d46..39a611f1e38 100644
--- a/homeassistant/components/http/www_static/polymer/home-assistant-api.html
+++ b/homeassistant/components/http/www_static/polymer/home-assistant-api.html
@@ -98,8 +98,14 @@
       var parts = state.entity_id.split(".");
       state.domain = parts[0];
       state.entity = parts[1];
-      state.entityDisplay = state.entity.replace(/_/g, " ");
       state.stateDisplay = state.state.replace(/_/g, " ");
+      state.canToggle = state.state == "on" || state.state == "off"
+
+      if(state.attributes.friendly_name) {
+        state.entityDisplay = state.attributes.friendly_name;
+      } else {
+        state.entityDisplay = state.entity.replace(/_/g, " ");
+      }
     },
 
     // call api methods
diff --git a/homeassistant/components/http/www_static/polymer/state-card.html b/homeassistant/components/http/www_static/polymer/state-card.html
index 9bb95a32b4b..7296840b466 100755
--- a/homeassistant/components/http/www_static/polymer/state-card.html
+++ b/homeassistant/components/http/www_static/polymer/state-card.html
@@ -88,12 +88,7 @@
 
         <div class='info'>
           <div class='name'>
-            <template if="{{state_attr['friendly_name']}}">
-              {{state_attr['friendly_name']}}
-            </template>
-            <template if="{{!state_attr['friendly_name']}}">
-              {{stateObj.entityDisplay}}
-            </template>
+            {{stateObj.entityDisplay}}
           </div>
 
           <div class="time-ago">
@@ -106,13 +101,13 @@
       </div>
 
       <template if="{{!stateUnknown}}">
-        <template if="{{stateObj.state == 'on' || stateObj.state == 'off'}}">
+        <template if="{{stateObj.canToggle}}">
           <div class='state toggle' self-center flex>
             <paper-toggle-button checked="{{toggleChecked}}">
             </paper-toggle-button>
           </div>
         </template>
-        <template if="{{stateObj.state != 'on' && stateObj.state != 'off'}}">
+        <template if="{{!stateObj.canToggle}}">
           <div class='state text'>{{stateObj.stateDisplay}}</div>
         </template>
       </template>