diff --git a/srv/poe_manager/generate_ips.py b/srv/poe_manager/generate_ips.py
index a299564..25f0fd1 100644
--- a/srv/poe_manager/generate_ips.py
+++ b/srv/poe_manager/generate_ips.py
@@ -14,13 +14,20 @@ def generate_ips_list():
     """).fetchall()
     conn.close()
 
-    for dev in devices:
+for dev in devices:
+        # Switchdaten holen, falls vorhanden
         switch = switches.get(dev['switch_hostname'])
-        if not switch:
-            continue
-        password = decrypt_password(switch['password'])
+        if switch:
+            switch_ip = switch['ip']
+            switch_user = switch['username']
+            switch_pass = decrypt_password(switch['password'])
+        else:
+            switch_ip = ""
+            switch_user = ""
+            switch_pass = ""
+
         port = dev['port'] or ""
-        print(f"{dev['rpi_ip']}:{dev['name']}:{switch['ip']}:{switch['hostname']}:{port}:{switch['username']}:{password}")
+        print(f"{dev['rpi_ip']}:{dev['name']}:{switch_ip}:{dev['switch_hostname'] or ''}:{port}:{switch_user}:{switch_pass}")
 
 if __name__ == "__main__":
-    generate_ips_list()
+    generate_ips_list()
\ No newline at end of file