diff --git a/admin_autoupdate.php b/admin_autoupdate.php
index 827031ae..5e826e46 100644
--- a/admin_autoupdate.php
+++ b/admin_autoupdate.php
@@ -105,7 +105,7 @@ if ($page == 'overview') {
 		}
 	} else {
 		// no new version
-		Response::standardSuccess('update.noupdatesavail');
+		Response::standardSuccess('update.noupdatesavail', [(Settings::Get('system.update_channel') == 'testing' ? lng('serversettings.uc_testing') : '')]);
 	}
 } // download the new archive
 elseif ($page == 'getdownload') {
diff --git a/admin_updates.php b/admin_updates.php
index f53c120b..babd4987 100644
--- a/admin_updates.php
+++ b/admin_updates.php
@@ -135,6 +135,6 @@ if ($page == 'overview') {
 			'alert_msg' => $ui_text . $message
 		]);
 	} else {
-		Response::standardSuccess('update.noupdatesavail');
+		Response::standardSuccess('update.noupdatesavail', [(Settings::Get('system.update_channel') == 'testing' ? lng('serversettings.uc_testing') : '')]);
 	}
 }
diff --git a/lib/Froxlor/Api/Commands/Froxlor.php b/lib/Froxlor/Api/Commands/Froxlor.php
index aebb408b..383c3c95 100644
--- a/lib/Froxlor/Api/Commands/Froxlor.php
+++ b/lib/Froxlor/Api/Commands/Froxlor.php
@@ -58,8 +58,6 @@ class Froxlor extends ApiCommand
 	 */
 	public function checkUpdate()
 	{
-		define('UPDATE_URI', "https://version.froxlor.org/Froxlor/api/" . $this->version);
-
 		if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) {
 
 			// log our actions
@@ -71,10 +69,10 @@ class Froxlor extends ApiCommand
 			if ($aucheck == 1) {
 				// anzeige über version-status mit ggfls. formular
 				// zum update schritt #1 -> download
-				$text = 'There is a newer version available: "' . AutoUpdate::getFromResult('version') . '" (Your current version is: ' . $this->version . ')';
+				$text = 'There is a newer ' . (Settings::Get('system.update_channel') == 'testing' ? 'testing ' : '') . 'version available: "' . AutoUpdate::getFromResult('version') . '" (Your current version is: ' . $this->version . ')';
 				return $this->response([
 					'isnewerversion' => (int) !AutoUpdate::getFromResult('has_latest'),
-					'version' => AutoUpdate::getFromResult('version'),
+					'version' => $this->version,
 					'message' => $text,
 					'link' => AutoUpdate::getFromResult('url'),
 					'additional_info' => AutoUpdate::getFromResult('info')
@@ -103,7 +101,7 @@ class Froxlor extends ApiCommand
 					'version' => $this->version,
 					'message' => '',
 					'link' => '',
-					'additional_info' => lng('update.noupdatesavail')
+					'additional_info' => lng('update.noupdatesavail', [(Settings::Get('system.update_channel') == 'testing' ? lng('serversettings.uc_testing') : '')])
 				]);
 			}
 		}
diff --git a/lib/Froxlor/Cli/UpdateCommand.php b/lib/Froxlor/Cli/UpdateCommand.php
index 3cf01421..e24a3fd2 100644
--- a/lib/Froxlor/Cli/UpdateCommand.php
+++ b/lib/Froxlor/Cli/UpdateCommand.php
@@ -94,7 +94,7 @@ final class UpdateCommand extends CliCommand
 						return self::SUCCESS;
 					}
 					// no new version
-					$output->writeln('<info>' . lng('update.noupdatesavail') . '</>');
+					$output->writeln('<info>' . lng('update.noupdatesavail', [(Settings::Get('system.update_channel') == 'testing' ? lng('serversettings.uc_testing') : '')]) . '</>');
 					$result = self::SUCCESS;
 				}
 			} catch (Exception $e) {
diff --git a/lng/de.lng.php b/lng/de.lng.php
index 8e72a014..4c37d8ea 100644
--- a/lng/de.lng.php
+++ b/lng/de.lng.php
@@ -2114,7 +2114,7 @@ Vielen Dank, Ihr Administrator',
 			'part_a' => 'Die Froxlor-Dateien wurden aktualisiert. Neue Version ist <strong>%s</strong>. Die bisher installierte Version ist <strong>%s</strong>',
 			'part_b' => '<br /><br />Ein Kunden-Login ist vor Abschluss des Aktualisierungsvorganges nicht möglich.<br /><strong>Aktualisierung ausführen?</strong>',
 		],
-		'noupdatesavail' => 'Ihre Froxlor-Version ist aktuell.',
+		'noupdatesavail' => 'Die genutzte %sVersion von Froxlor ist aktuell.',
 		'description' => 'Aktualisierung der froxlor Datenbank',
 	],
 	'usersettings' => [
diff --git a/lng/en.lng.php b/lng/en.lng.php
index 7de1cfe3..98caad49 100644
--- a/lng/en.lng.php
+++ b/lng/en.lng.php
@@ -2499,7 +2499,7 @@ Yours sincerely, your administrator',
 			'part_a' => 'The Froxlor files have been updated to version <strong>%s</strong>. The installed version is <strong>%s</strong>.',
 			'part_b' => '<br /><br />Customers will not be able to log in until the update has been finished.<br /><strong>Proceed?</strong>',
 		],
-		'noupdatesavail' => 'You already have the latest Froxlor version.',
+		'noupdatesavail' => 'You already have the latest %sversion of Froxlor installed.',
 		'description' => 'Running database updates for your froxlor installation',
 	],
 	'usersettings' => [