diff --git a/src/display.h b/src/display.h
index 704f708ea..afd0e6fcd 100644
--- a/src/display.h
+++ b/src/display.h
@@ -256,13 +256,13 @@ void Displaymachinestate() {
         u8g2.setFont(u8g2_font_profont11_tf);
         u8g2.drawXBMP(0, 0, logo_width, logo_height, logo_bits_u8g2);  // draw temp icon
         u8g2.setCursor(32, 24);
-        u8g2.print("Ist :  ");
+        u8g2.print(langstring_current_temp);
         u8g2.print(temperature, 1);
         u8g2.print(" ");
         u8g2.print((char)176);
         u8g2.print("C");
         u8g2.setCursor(32, 34);
-        u8g2.print("Soll:  ");
+        u8g2.print(langstring_set_temp);
         u8g2.print(setPoint, 1);
         u8g2.print(" ");
         u8g2.print((char)176);
diff --git a/src/languages.h b/src/languages.h
index 611071bbd..057d62ff7 100644
--- a/src/languages.h
+++ b/src/languages.h
@@ -7,7 +7,7 @@
 #include "userConfig.h"
 
 #if (LANGUAGE == 0) // DE
-#if (DISPLAYTEMPLATE == 1) || (DISPLAYTEMPLATE == 2)
+#if (DISPLAYTEMPLATE <= 3)
     static const char *langstring_set_temp = "Soll:  ";
     static const char *langstring_current_temp = "Ist:   ";
     static const char *langstring_brew = "Brew:  ";
@@ -36,7 +36,7 @@ static const char *langstring_bckfactivated[] = {"Backflush aktiviert", "Bruehsc
 static const char *langstring_bckfrunning[] = {"Backflush aktiv:", "seit"};
 
 #elif LANGUAGE == 1 // EN
-#if (DISPLAYTEMPLATE == 1) || (DISPLAYTEMPLATE == 2)
+#if (DISPLAYTEMPLATE <= 3)
     static const char *langstring_set_temp = "Set:   ";
     static const char *langstring_current_temp = "Temp:  ";
     static const char *langstring_brew = "Brew:  ";
@@ -65,7 +65,7 @@ static const char *langstring_bckfactivated[] = {"Backflush activated", "Please
 static const char *langstring_bckfrunning[] = {"Backflush running:", "from"};
 
 #elif LANGUAGE == 2 // ES
-#if (DISPLAYTEMPLATE == 1) || (DISPLAYTEMPLATE == 2)
+#if (DISPLAYTEMPLATE <= 3)
     static const char *langstring_set_temp = "Obj:  ";
     static const char *langstring_current_temp = "T:    ";
     static const char *langstring_brew = "Brew:  ";