diff --git a/gitea-chat-bridge/main.py b/gitea-chat-bridge/main.py
index 770620d..b1426d6 100644
--- a/gitea-chat-bridge/main.py
+++ b/gitea-chat-bridge/main.py
@@ -8,8 +8,20 @@ CHAT_WEBHOOK = os.environ.get("CHAT_WEBHOOK_URL")
 def handler(request):
     try:
         payload = request.get_json(silent=True) or {}
-        repo    = payload.get("repository", {}).get("full_name", "unknown")
-        pusher  = payload.get("pusher", {}).get("login", "unknown")
+        repo_obj = payload.get("repository", {})
+        repo     = repo_obj.get("full_name") or repo_obj.get("name") or "(ukjent repo)"
+
+        pusher_obj = payload.get("pusher", {})
+        pusher     = (
+            pusher_obj.get("login")
+            or pusher_obj.get("full_name")
+            or pusher_obj.get("name")
+            or pusher_obj.get("email")
+            or payload.get("sender", {}).get("login")
+            or payload.get("sender", {}).get("full_name")
+            or "(ukjent bruker)"
+        )
+
         ref     = payload.get("ref", "").replace("refs/heads/", "")
         commits = payload.get("commits", [])
         lines   = [f"\U0001f500 *Push til {repo}* \u2014 branch {ref} av {pusher}"]