diff --git a/bot.py b/bot.py
index 91b88cd..2a8c3ab 100644
--- a/bot.py
+++ b/bot.py
@@ -9,6 +9,7 @@ import sys
 import asyncio
 import subprocess
 import logging
+import getpass
 from pathlib import Path
 from typing import Optional, Callable, Dict, Any, List
 from dataclasses import dataclass, field
@@ -106,13 +107,18 @@ class ServerManager:
         self._servers: Dict[str, Server] = {}
         self._default_server: str = "local"
         self._ssh_key_path: Optional[str] = None
-        
+
         # Локальный сервер всегда доступен
+        try:
+            local_user = getpass.getuser()
+        except Exception:
+            local_user = "user"
+
         self._servers["local"] = Server(
             name="local",
             host="localhost",
             port=22,
-            user=os.getenv("USER", "user"),
+            user=local_user,
             tags=["local", "dev"]
         )