diff --git a/typescript-version/src/index.html b/typescript-version/src/index.html
index b16e108..57b6844 100644
--- a/typescript-version/src/index.html
+++ b/typescript-version/src/index.html
@@ -1628,8 +1628,11 @@
             document.getElementById('pageTitle').textContent = name;
 
             if (!isConnected) {
-                updateStatus('Nicht verbunden', false);
-                return;
+                await connect();
+                if (!isConnected) {
+                    document.getElementById('vodGrid').innerHTML = '<div class="empty-state"><h3>Nicht verbunden</h3><p>Bitte Twitch API Daten in den Einstellungen prufen.</p></div>';
+                    return;
+                }
             }
 
             document.getElementById('vodGrid').innerHTML = '<div class="empty-state"><p>Lade VODs...</p></div>';
@@ -1887,8 +1890,8 @@
 
         // Settings
         async function saveSettings() {
-            const clientId = document.getElementById('clientId').value;
-            const clientSecret = document.getElementById('clientSecret').value;
+            const clientId = document.getElementById('clientId').value.trim();
+            const clientSecret = document.getElementById('clientSecret').value.trim();
             const downloadPath = document.getElementById('downloadPath').value;
             const downloadMode = document.getElementById('downloadMode').value;
             const partMinutes = parseInt(document.getElementById('partMinutes').value);
diff --git a/typescript-version/src/main.ts b/typescript-version/src/main.ts
index 3d67f8f..e88fe4a 100644
--- a/typescript-version/src/main.ts
+++ b/typescript-version/src/main.ts
@@ -291,11 +291,19 @@ async function twitchLogin(): Promise<boolean> {
     }
 }
 
-async function getUserId(username: string): Promise<string | null> {
-    if (!accessToken) return null;
+async function ensureTwitchAuth(forceRefresh = false): Promise<boolean> {
+    if (!forceRefresh && accessToken) {
+        return true;
+    }
 
-    try {
-        const response = await axios.get('https://api.twitch.tv/helix/users', {
+    return await twitchLogin();
+}
+
+async function getUserId(username: string): Promise<string | null> {
+    if (!(await ensureTwitchAuth())) return null;
+
+    const fetchUser = async () => {
+        return await axios.get('https://api.twitch.tv/helix/users', {
             params: { login: username },
             headers: {
                 'Client-ID': config.client_id,
@@ -303,18 +311,32 @@ async function getUserId(username: string): Promise<string | null> {
             },
             timeout: API_TIMEOUT
         });
+    };
+
+    try {
+        const response = await fetchUser();
         return response.data.data[0]?.id || null;
     } catch (e) {
+        if (axios.isAxiosError(e) && e.response?.status === 401 && (await ensureTwitchAuth(true))) {
+            try {
+                const retryResponse = await fetchUser();
+                return retryResponse.data.data[0]?.id || null;
+            } catch (retryError) {
+                console.error('Error getting user after relogin:', retryError);
+                return null;
+            }
+        }
+
         console.error('Error getting user:', e);
         return null;
     }
 }
 
 async function getVODs(userId: string): Promise<VOD[]> {
-    if (!accessToken) return [];
+    if (!(await ensureTwitchAuth())) return [];
 
-    try {
-        const response = await axios.get('https://api.twitch.tv/helix/videos', {
+    const fetchVods = async () => {
+        return await axios.get('https://api.twitch.tv/helix/videos', {
             params: {
                 user_id: userId,
                 type: 'archive',
@@ -326,18 +348,32 @@ async function getVODs(userId: string): Promise<VOD[]> {
             },
             timeout: API_TIMEOUT
         });
+    };
+
+    try {
+        const response = await fetchVods();
         return response.data.data;
     } catch (e) {
+        if (axios.isAxiosError(e) && e.response?.status === 401 && (await ensureTwitchAuth(true))) {
+            try {
+                const retryResponse = await fetchVods();
+                return retryResponse.data.data;
+            } catch (retryError) {
+                console.error('Error getting VODs after relogin:', retryError);
+                return [];
+            }
+        }
+
         console.error('Error getting VODs:', e);
         return [];
     }
 }
 
 async function getClipInfo(clipId: string): Promise<any | null> {
-    if (!accessToken) return null;
+    if (!(await ensureTwitchAuth())) return null;
 
-    try {
-        const response = await axios.get('https://api.twitch.tv/helix/clips', {
+    const fetchClip = async () => {
+        return await axios.get('https://api.twitch.tv/helix/clips', {
             params: { id: clipId },
             headers: {
                 'Client-ID': config.client_id,
@@ -345,8 +381,22 @@ async function getClipInfo(clipId: string): Promise<any | null> {
             },
             timeout: API_TIMEOUT
         });
+    };
+
+    try {
+        const response = await fetchClip();
         return response.data.data[0] || null;
     } catch (e) {
+        if (axios.isAxiosError(e) && e.response?.status === 401 && (await ensureTwitchAuth(true))) {
+            try {
+                const retryResponse = await fetchClip();
+                return retryResponse.data.data[0] || null;
+            } catch (retryError) {
+                console.error('Error getting clip after relogin:', retryError);
+                return null;
+            }
+        }
+
         console.error('Error getting clip:', e);
         return null;
     }