diff --git a/app.py b/app.py
index aead127..8e67339 100644
--- a/app.py
+++ b/app.py
@@ -169,12 +169,25 @@ def get_user_dynamic_variables(user_id):
 
 def ensure_local_defaults(content, user_id):
     default_entries = LocalDefaultEntry.query.filter_by(user_id=user_id).all()
-    required_lines = [entry.hostname for entry in default_entries]
+    required_lines = []
 
-    lines = [l.rstrip() for l in content.splitlines()]
-    lines = [line for line in lines if line not in required_lines]
+    for entry in default_entries:
+        # Sprawdzenie, czy wpis zawiera zarówno IP, jak i hostname
+        if entry.ip_address and entry.hostname:
+            required_lines.append(f"{entry.ip_address} {entry.hostname}".strip())
+
+    # Usuń puste linie i unikaj duplikatów
+    lines = [l.rstrip() for l in content.splitlines() if l.strip()]
+    lines = [line for line in lines if not any(line.startswith(e.split()[0]) for e in required_lines)]
+    
+    # Dodaj wymagane wpisy na górę listy
     lines = required_lines + lines
-    return "\n".join(lines) + "\n"
+
+    # Połącz w finalny format
+    final_content = "\n".join(lines) + "\n"
+
+    return final_content
+
 
 def get_user_dynamic_variables(user_id):
     user_variables = UserDynamicVariables.query.filter_by(user_id=user_id).all()
@@ -394,9 +407,11 @@ def cleanup_old_backups():
 
 def format_host(host):
     if host.use_daemon and host.type == 'linux' and host.daemon_url:
-        return f"{host.resolved_daemon or host.hostname} ({host.raw_ip})"
+        resolved_name = host.resolved_daemon or host.hostname
     else:
-        return f"{host.resolved_hostname or host.hostname} ({host.raw_ip})"
+        resolved_name = host.resolved_hostname or host.hostname
+    return f"{resolved_name} ({host.raw_ip})"
+
 
 # -------------------
 # LOGOWANIE, REJESTRACJA, ZMIANA HASŁA