diff --git a/src/components/postwall.js b/src/components/postwall.js
index 6508bfb..b31ab0f 100644
--- a/src/components/postwall.js
+++ b/src/components/postwall.js
@@ -1,3 +1,6 @@
+const apiUrl = 'https://kirche.social/api/v1/timelines/tag/fedikirche?limit=20';
+const defaultInstance = 'kirche.social';
+
 export async function loadPostwall() {
     const container = document.getElementById('postswall-container');
 
@@ -17,9 +20,6 @@ export async function loadPostwall() {
         });
     }
 
-    // Mastodon API-URL für Hashtag-Suche
-    const apiUrl = 'https://kirche.social/api/v1/timelines/tag/fedikirche?limit=20';
-
     // Posts laden
     async function fetchPosts() {
         try {
@@ -42,6 +42,7 @@ export async function loadPostwall() {
     // Posts rendern
     function renderPosts(posts) {
         container.innerHTML = ''; // Vorherige Inhalte leeren
+
         posts.forEach(post => {
             const postElement = document.createElement('a');
             postElement.classList.add('post');
@@ -56,7 +57,14 @@ export async function loadPostwall() {
     
             let content = post.content || 'Kein Inhalt verfügbar.';
             const author = post.account.display_name || post.account.username;
-            const username = `@${post.account.acct}`;
+
+            // Prüfen, ob der Username den Serverteil enthält
+            let username = post.account.acct;
+            if (!username.includes('@')) {
+                username = `${username}@${defaultInstance}`;
+            }
+            username = `@${username}`;
+
             const avatar = post.account.avatar || 'src/assets/default-avatar.png';
         
             // Links deaktivieren