diff --git a/homeassistant/components/script.py b/homeassistant/components/script.py
index 3f892fdfa80..e5bfe61bfa5 100644
--- a/homeassistant/components/script.py
+++ b/homeassistant/components/script.py
@@ -75,7 +75,7 @@ def setup(hass, config):
             _LOGGER.warn("Missing key 'sequence' for script %s", name)
             continue
         alias = cfg.get(CONF_ALIAS, name)
-        script = Script(hass, alias, cfg[CONF_SEQUENCE])
+        script = Script(hass, alias, name, cfg[CONF_SEQUENCE])
         component.add_entities((script,))
         _, object_id = split_entity_id(script.entity_id)
         hass.services.register(DOMAIN, object_id, service_handler)
@@ -100,9 +100,10 @@ def setup(hass, config):
 
 class Script(ToggleEntity):
     """ Represents a script. """
-    def __init__(self, hass, name, sequence):
+    def __init__(self, hass, name, entity_id, sequence):
         self.hass = hass
         self._name = name
+        self.entity_id = entity_id
         self.sequence = sequence
         self._lock = threading.Lock()
         self._cur = -1
diff --git a/homeassistant/helpers/entity_component.py b/homeassistant/helpers/entity_component.py
index 708bf6e93a9..5223b7f0ca3 100644
--- a/homeassistant/helpers/entity_component.py
+++ b/homeassistant/helpers/entity_component.py
@@ -65,8 +65,10 @@ class EntityComponent(object):
             if entity is not None and entity not in self.entities.values():
                 entity.hass = self.hass
 
-                entity.entity_id = generate_entity_id(
-                    self.entity_id_format, entity.name, self.entities.keys())
+                if entity.entity_id is None:
+                    entity.entity_id = generate_entity_id(
+                        self.entity_id_format, entity.name,
+                        self.entities.keys())
 
                 self.entities[entity.entity_id] = entity