diff --git a/static/game/debug/renderer.js b/static/game/debug/renderer.js
index d5867b218721fdd7b823962c4324a2a3ecbfc315..bacab2301764c55dcccf94c34b3bb3214944580b 100644
--- a/static/game/debug/renderer.js
+++ b/static/game/debug/renderer.js
@@ -1,5 +1,7 @@
 function render(_role, _roles){
 
+    HEADER_SET(ROOM_CODE, "Lynchburg", PLAYER_NAME+":"+_role);
+
     if(_role in _roles) {
         renderRole(_roles[_role], _roles["idle"]);
         return;
diff --git a/views/default/login.html b/views/default/login.html
index a16cabc2ed7e4e42b42373b1c026014a2409ac3a..77b685ca36c52555e6b4fa3455455bbf7dcd5ffe 100644
--- a/views/default/login.html
+++ b/views/default/login.html
@@ -1,5 +1,4 @@
 {{include 'include/popup.html'}}
-{{include 'include/header_default.html'}}
 
 <form id="form_login" @submit.prevent="submitLogin">
     <input type="text" id="room_code" placeholder="{{=T('Enter Room Code')}}" maxlength="4" v-model="room_code"><br><br>
@@ -8,6 +7,9 @@
 </form>
 
 <script>
+
+    HEADER_SET("", "Lynchburg", "");
+
     var app = new Vue({
   el: "#form_login",
   data: {
diff --git a/views/game/debug/renderer.html b/views/game/debug/renderer.html
index 320ebb0171418406afabeb14b83fa861853f9d63..cf111f2e8ebcdf57809d3bb2a80cdaa2744e4eb8 100644
--- a/views/game/debug/renderer.html
+++ b/views/game/debug/renderer.html
@@ -6,6 +6,5 @@
 
 
 {{block game_js}}
-    {{include 'include/header_debug.html'}}
     <script src="{{=URL('static/game/debug','renderer.js')}}" type="text/javascript"></script>
 {{end game_js}}
diff --git a/views/include/header_debug.html b/views/include/header_debug.html
deleted file mode 100644
index d900f69034782cd968f98b7a7ecc35d23158acfe..0000000000000000000000000000000000000000
--- a/views/include/header_debug.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script type="text/javascript">
-    $("#header_left").html(ROOM_CODE);
-    $("#header_center").html("Lynchburg");
-    $("#header_right").html(PLAYER_NAME+":{{=player_record.role}}");
-</script>
diff --git a/views/include/header_default.html b/views/include/header_default.html
deleted file mode 100644
index c92519a2a90e7454fa60bdfbf38b9661b445717f..0000000000000000000000000000000000000000
--- a/views/include/header_default.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script type="text/javascript">
-    $("#header_left").html("");
-    $("#header_center").html("Lynchburg");
-    $("#header_right").html("");
-</script>
diff --git a/views/layout.html b/views/layout.html
index 20f7ab692a490ac842ce70d8584200456f1614bf..418587028ea63764937368a1a1835eb63ee62147 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -6,6 +6,13 @@
         <script src="{{=URL('static','js/jquery.js')}}" type="text/javascript"></script>
         <script src="{{=URL('static','js/ajax.js')}}" type="text/javascript"></script>
         <script src="{{=URL('static','js/vue.js')}}" type="text/javascript"></script>
+        <script type="text/javascript">
+            function HEADER_SET(_left, _middle, _right) {
+                $("#header_left").html(_left);
+                $("#header_center").html(_middle);
+                $("#header_right").html(_right);
+            }
+        </script>
 
         {{block head}}{{end head}}
     </head>