diff --git a/includes/class-formidable.php b/includes/class-formidable.php
index d25fb14..a5f48d4 100644
--- a/includes/class-formidable.php
+++ b/includes/class-formidable.php
@@ -278,54 +278,33 @@ class DDHH_JM_Formidable {
 		?>
 		<script type="text/javascript">
 		jQuery(document).ready(function($) {
+			var ddhhRedirectTriggered = false;
+
+			function triggerRedirect() {
+				if (ddhhRedirectTriggered) return;
+				ddhhRedirectTriggered = true;
+				console.log('DDHH: Redirecting to dashboard in 1.5s...');
+				setTimeout(function() {
+					window.location.href = '<?php echo esc_js( $redirect_url ); ?>';
+				}, 1500);
+			}
+
 			// Watch for Formidable success messages
-			// The form shows "Registrierung erfolgreich! Sie werden weitergeleitet..."
-			setInterval(function() {
-				// Look for the success message in the form container
-				var successMsg = $('.frm_message, .frm-message, [class*="success"]').filter(function() {
-					return $(this).text().indexOf('Registrierung erfolgreich') !== -1 ||
-					       $(this).text().indexOf('erfolgreich') !== -1;
+			var checkInterval = setInterval(function() {
+				if (ddhhRedirectTriggered) {
+					clearInterval(checkInterval);
+					return;
+				}
+
+				var successMsg = $('.frm_message, .frm-message').filter(function() {
+					return $(this).text().indexOf('Registrierung erfolgreich') !== -1;
 				});
 
 				if (successMsg.length > 0 && successMsg.is(':visible')) {
-					console.log('Success message detected, redirecting...');
-					// Redirect after showing the message
-					setTimeout(function() {
-						window.location.href = '<?php echo esc_js( $redirect_url ); ?>';
-					}, 1500);
-					// Stop checking
-					return false;
+					clearInterval(checkInterval);
+					triggerRedirect();
 				}
-			}, 100);
-
-			// Also listen for form submission completion
-			if (typeof window.FrmForm !== 'undefined') {
-				console.log('Formidable Form object found');
-			}
-
-			// Fallback: Monitor form elements for changes
-			// Look for any Formidable form that might be the registration form
-			$('form').each(function() {
-				var form = $(this);
-				var formId = form.find('[name="form_id"]').val();
-				console.log('Found form with ID:', formId);
-
-				// Watch for display of success message in this form
-				var observer = new MutationObserver(function(mutations) {
-					mutations.forEach(function(mutation) {
-						var text = $(mutation.target).text();
-						if (text.indexOf('erfolgreich') !== -1 || text.indexOf('Registrierung') !== -1) {
-							console.log('Success message appeared in form', formId);
-							setTimeout(function() {
-								window.location.href = '<?php echo esc_js( $redirect_url ); ?>';
-							}, 1500);
-						}
-					});
-				});
-
-				// Monitor the form for changes
-				observer.observe(form[0], { childList: true, subtree: true, characterData: true });
-			});
+			}, 200);
 		});
 		</script>
 		<?php