diff --git a/data/index.html b/data/index.html
index 7344687..05b8eb2 100644
--- a/data/index.html
+++ b/data/index.html
@@ -5,9 +5,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>Dark Emergency CTF Timer - by hiabuto.de</title>
+    <title>%TITLE% - by hiabuto.de</title>
 
-    <meta name="description" content="A project, designed by hiabuto.de">
+    <meta name="description" content="A Project, designed by hiabuto.de">
     <meta name="author" content="Marcel Peterkau">
 
     <link href="css/style.css" rel="stylesheet">
diff --git a/platformio.ini b/platformio.ini
index b85c9b4..0b66517 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,6 +16,7 @@ board_build.f_flash = 80000000L
 board_build.ldscript = eagle.flash.4m1m.ld
 
 build_flags=
+    -D DEVICE_NAME='"DE CTF Timer Prototype 1"'
     -D WIFI_CLIENT
     -D WIFI_SSID='"BND_Scanner_#42"'
     -D WIFI_PASS='"5xMYkerbLMdrsSdF3hpy5DM9"'
diff --git a/src/defaults.h b/src/defaults.h
index a2d5262..eb59955 100644
--- a/src/defaults.h
+++ b/src/defaults.h
@@ -18,6 +18,10 @@
 #endif
 
 
+#ifndef DEVICE_NAME
+#define DEVICE_NAME WIFI_SSID
+#endif
+
 #ifndef BAT_LOW_PERCENT
 #define BAT_LOW_PERCENT 10
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index 805ec42..067100c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -114,7 +114,7 @@ String processor(const String &var)
     return FACTION_3_NAME;
 
   if (var == "TITLE")
-    return WIFI_SSID;
+    return DEVICE_NAME;
 
   if (var == "BATTERY_LEVEL")
   {