diff --git a/assets/js/gallery-pro.js b/assets/js/gallery-pro.js
index 7d9689f..4583223 100644
--- a/assets/js/gallery-pro.js
+++ b/assets/js/gallery-pro.js
@@ -263,6 +263,10 @@
 
     // Forum-Login: Auf globales Event reagieren
     $(document).on('mc_gallery_forum_verified', function(e, data) {
+        var fallbackServerId = $('#mc-upload-server').val() || '';
+        if (data && !data.server_id) {
+            data.server_id = fallbackServerId;
+        }
         if (!data || !data.mc_username || !data.server_id) {
             showFeedback('Forum-Login: Ungültige Antwort vom Server.', 'error');
             return;
@@ -327,6 +331,13 @@
                 success: function (data) {
                     $btn.prop('disabled', false).html(originalText);
                     if (data.success && data.data && data.data.mc_username) {
+                        if (!data.data.server_id) {
+                            data.data.server_id = serverId || ($('#mc-upload-server').val() || '');
+                        }
+                        if (!data.data.server_id) {
+                            showFeedback('Forum-Login erfolgreich, aber keine Server-ID gefunden. Bitte Server wählen und erneut versuchen.', 'error');
+                            return;
+                        }
                         sessionData.verified = true;
                         sessionData.username = data.data.mc_username;
                         sessionData.serverId = data.data.server_id;