diff --git a/custom_components/whatsapp_bridge_integration/__init__.py b/custom_components/whatsapp_bridge_integration/__init__.py
index 7fed22f..74a58cf 100644
--- a/custom_components/whatsapp_bridge_integration/__init__.py
+++ b/custom_components/whatsapp_bridge_integration/__init__.py
@@ -9,20 +9,20 @@ async def async_setup(hass: HomeAssistant, config: dict):
     return True
 
 async def async_setup_entry(hass: HomeAssistant, entry):
-    """Set up entry, create general device and forward to sensor platform."""
+    """Set up entry, create specific contact device and forward to sensor platform."""
     # Lege die Daten im hass-Objekt ab
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = entry.data
 
-    # 1. Hauptgerät (General Device) im Device Registry anlegen
+    # 1. Eigenes Gerät SPEZIFISCH für diesen Account/Kontakt anlegen
     device_registry = dr.async_get(hass)
     device_registry.async_get_or_create(
         config_entry_id=entry.entry_id,
-        identifiers={(DOMAIN, "general_gateway")},
-        name="WhatsApp Bridge Gateway",
+        identifiers={(DOMAIN, entry.entry_id)},  # Einzigartig pro Eintrag
+        name=f"WhatsApp {entry.title}",
         manufacturer="Bahmcloud",
-        model="Bridge Server v0.2.0",
-        sw_version="0.2.0",
+        model="Kontakt-Endpunkt",
+        sw_version="0.2.1",
     )
 
     # Forward the setup to the sensor platform to create entities