diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 0b07f99f9..8d3fea58e 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1323,8 +1323,8 @@ networkmenu.ntpenable Zeit per INet synchronisieren
 networkmenu.ntprefresh NTP/DVB-Aktualisierung
 networkmenu.ntprefresh_hint1 NTP/DVB-Time-Sync [min]
 networkmenu.ntprefresh_hint2 braucht Reboot oder EPG-Reset
-networkmenu.ntpserver NTP-URL (Zeitserver)
-networkmenu.ntpserver_hint1 NTP-URL Beispiel: ntp1.ptb.de
+networkmenu.ntpserver NTP-Server
+networkmenu.ntpserver_hint1 NTP-Server Beispiel: ntp1.ptb.de
 networkmenu.ntpserver_hint2 braucht Reboot oder EPG-Reset
 networkmenu.ntptitle Zeitsynchronisation
 networkmenu.password Passwort (PSK)
diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp
index 461707d91..1e77d421e 100644
--- a/src/gui/network_setup.cpp
+++ b/src/gui/network_setup.cpp
@@ -767,6 +767,12 @@ void CNetworkSetup::testNetworkSettings()
 		//Nameserver
 		text += (std::string)g_Locale->getText(LOCALE_NETWORKMENU_NAMESERVER) + ":\n";
 		text += offset + (std::string)our_nameserver + " " + (std::string)mypinghost(our_nameserver) + "\n";
+		//NTPserver
+		if ( (pinghost(our_nameserver) == 1) && g_settings.network_ntpenable && (g_settings.network_ntpserver != "") )
+		{
+			text += (std::string)g_Locale->getText(LOCALE_NETWORKMENU_NTPSERVER) + ":\n";
+			text += offset + g_settings.network_ntpserver + " " + (std::string)mypinghost(g_settings.network_ntpserver.c_str()) + "\n";
+		}
 		//Wiki
 		text += wiki_URL + ":\n";
 		text += offset + "via IP (" + wiki_IP + "): " + (std::string)mypinghost(wiki_IP.c_str()) + "\n";