diff --git a/src/admin/result.php b/src/admin/result.php
index afb19e6..c382c98 100644
--- a/src/admin/result.php
+++ b/src/admin/result.php
@@ -62,7 +62,11 @@ $content['REDIRSECONDS'] =  GetConfigSetting("AdminChangeWaitTime", 2, CFGLEVEL_
 // --- CONTENT Vars
 if ( isset($_GET['redir']) )
 {
-	$content['EXTRA_METATAGS'] = '<meta HTTP-EQUIV="REFRESH" CONTENT="' . $content['REDIRSECONDS'] . '; URL=' . urldecode($_GET['redir']) . '">';
+	// Only automatically redirect if above 0
+	if ( $content['REDIRSECONDS'] > 0 ) 
+		$content['EXTRA_METATAGS'] = '<meta HTTP-EQUIV="REFRESH" CONTENT="' . $content['REDIRSECONDS'] . '; URL=' . urldecode($_GET['redir']) . '">';
+
+	// Set redir string
 	$content['SZREDIR'] = urldecode($_GET['redir']);
 }
 else
@@ -75,7 +79,13 @@ if ( isset($_GET['msg']) )
 else
 	$content['SZMSG'] = $content["LN_ADMIN_UNKNOWNSTATE"]; 
 
-$content['TITLE'] = "LogAnalyzer - Redirecting to '" . $content['SZREDIR'] . "' in " . $content['REDIRSECONDS'] . " seconds";	// Title of the Page 
+if ( $content['REDIRSECONDS'] > 0 ) {
+	$content['TITLE'] = "LogAnalyzer - Redirecting to '" . $content['SZREDIR'] . "' in " . $content['REDIRSECONDS'] . " seconds";	// Title of the Page 
+	$content['LN_ADMIN_RESULTLINK'] = GetAndReplaceLangStr($content['LN_ADMIN_RESULTREDIRECT'], $content['SZREDIR'], $content['REDIRSECONDS']); 
+} else {
+	$content['TITLE'] = "LogAnalyzer - Redirecting to '" . $content['SZREDIR'] . "'";	// Title of the Page 
+	$content['LN_ADMIN_RESULTLINK'] = GetAndReplaceLangStr($content['LN_ADMIN_RESULTCLICK'], $content['SZREDIR']); 
+}
 // --- 
 
 // --- Parsen and Output
diff --git a/src/lang/de/admin.php b/src/lang/de/admin.php
index 1de0ccf..98168b7 100644
--- a/src/lang/de/admin.php
+++ b/src/lang/de/admin.php
@@ -59,7 +59,9 @@ $content['LN_ADMIN_CLEARDATA'] = "Wenn Sie alte Datenbankeintr&auml;ge l&ouml;sc
 $content['LN_UPDATE_AVAILABLE'] = "Update available";
 $content['LN_UPDATE_INSTALLEDVER'] = "Installed version: ";
 $content['LN_UPDATE_AVAILABLEVER'] = "Available version: ";
-$content['LN_UPDATE_LINK'] = "Click here to get the update";
+$content['LN_UPDATE_LINK'] = "Klicken Sie hier um das Update zu bekommen";
+$content['LN_ADMIN_RESULTREDIRECT'] = "Sie werden in %2 Sekunden auf diese <A HREF='%1'>Seite</A> weitergeleitet.";
+$content['LN_ADMIN_RESULTCLICK'] = "Klicken Sie <A HREF='%1'>hier</A> um fortzufahren.";
 
 // General Options
 $content['LN_ADMIN_GLOBFRONTEND'] = "Globale Anzeige Optionen";
diff --git a/src/lang/en/admin.php b/src/lang/en/admin.php
index 97f544b..1d450b6 100644
--- a/src/lang/en/admin.php
+++ b/src/lang/en/admin.php
@@ -60,6 +60,8 @@ $content['LN_UPDATE_AVAILABLE'] = "Update available";
 $content['LN_UPDATE_INSTALLEDVER'] = "Installed version: ";
 $content['LN_UPDATE_AVAILABLEVER'] = "Available version: ";
 $content['LN_UPDATE_LINK'] = "Click here to get the update";
+$content['LN_ADMIN_RESULTREDIRECT'] = "You will be redirected to the <A HREF='%1'>this page</A> on %2 seconds.";
+$content['LN_ADMIN_RESULTCLICK'] = "Click <A HREF='%1'>here</A> to continue.";
 
 // General Options
 $content['LN_ADMIN_GLOBFRONTEND'] = "Global frontend options";
diff --git a/src/templates/admin/result.html b/src/templates/admin/result.html
index de4f0dc..d53011b 100644
--- a/src/templates/admin/result.html
+++ b/src/templates/admin/result.html
@@ -12,7 +12,7 @@
 			<br><br>
 			<b>{SZMSG}</b>
 			<br><br>
-			You will be redirected to the <A HREF="{SZREDIR}">this page</A> on {REDIRSECONDS} seconds.
+			{LN_ADMIN_RESULTLINK}
 			<br><br>
 
 		</td>