diff --git a/proxy/files/html/errors/error.html b/proxy/files/html/errors/error.html
index 7bf82ab..70d4970 100644
--- a/proxy/files/html/errors/error.html
+++ b/proxy/files/html/errors/error.html
@@ -13,9 +13,13 @@
     <div class="pure-g">
       <div class="pure-u-1-1"> 
         <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
           <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
         </div>  
       </div>
       <div class="pure-u-1-1"></div>
diff --git a/proxy/files/html/errors/error_403.html b/proxy/files/html/errors/error_403.html
index 306fbbc..70f03ce 100644
--- a/proxy/files/html/errors/error_403.html
+++ b/proxy/files/html/errors/error_403.html
@@ -13,9 +13,13 @@
     <div class="pure-g">
       <div class="pure-u-1-1"> 
         <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
           <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
         </div>  
       </div>
       <div class="pure-u-1-1"></div>
diff --git a/proxy/files/html/errors/error_404.html b/proxy/files/html/errors/error_404.html
index bbda212..dbcbcbd 100644
--- a/proxy/files/html/errors/error_404.html
+++ b/proxy/files/html/errors/error_404.html
@@ -13,9 +13,13 @@
     <div class="pure-g">
       <div class="pure-u-1-1"> 
         <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
           <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
         </div>  
       </div>
       <div class="pure-u-1-1"></div>
diff --git a/proxy/files/html/errors/error_50x.html b/proxy/files/html/errors/error_50x.html
index 1f5b939..a93c4bf 100644
--- a/proxy/files/html/errors/error_50x.html
+++ b/proxy/files/html/errors/error_50x.html
@@ -15,9 +15,13 @@
     <div class="pure-g">
       <div class="pure-u-1-1"> 
         <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
           <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
         </div>  
       </div>
       <div class="pure-u-1-1"></div>
diff --git a/web/files/html/errors/error.html b/web/files/html/errors/error.html
index 7bf82ab..70d4970 100644
--- a/web/files/html/errors/error.html
+++ b/web/files/html/errors/error.html
@@ -13,9 +13,13 @@
     <div class="pure-g">
       <div class="pure-u-1-1"> 
         <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
           <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
         </div>  
       </div>
       <div class="pure-u-1-1"></div>
diff --git a/web/files/html/errors/error_403.html b/web/files/html/errors/error_403.html
index 306fbbc..70f03ce 100644
--- a/web/files/html/errors/error_403.html
+++ b/web/files/html/errors/error_403.html
@@ -13,9 +13,13 @@
     <div class="pure-g">
       <div class="pure-u-1-1"> 
         <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
           <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
         </div>  
       </div>
       <div class="pure-u-1-1"></div>
diff --git a/web/files/html/errors/error_404.html b/web/files/html/errors/error_404.html
index bbda212..dbcbcbd 100644
--- a/web/files/html/errors/error_404.html
+++ b/web/files/html/errors/error_404.html
@@ -13,9 +13,13 @@
     <div class="pure-g">
       <div class="pure-u-1-1"> 
         <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
           <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
         </div>  
       </div>
       <div class="pure-u-1-1"></div>
diff --git a/web/files/html/errors/error_50x.html b/web/files/html/errors/error_50x.html
index 1f5b939..a93c4bf 100644
--- a/web/files/html/errors/error_50x.html
+++ b/web/files/html/errors/error_50x.html
@@ -15,9 +15,13 @@
     <div class="pure-g">
       <div class="pure-u-1-1"> 
         <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
           <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
         </div>  
       </div>
       <div class="pure-u-1-1"></div>
diff --git a/web/files/html/index.html b/web/files/html/index.html
index 577a35a..2cff36b 100644
--- a/web/files/html/index.html
+++ b/web/files/html/index.html
@@ -16,26 +16,33 @@
         <div class="logo">
           <div class="left"><!--# echo var="server_domain" default="some" --></div>
           <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="website" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
         </div>  
       </div>
       <div class="pure-u-1-1"></div>
       <div class="pure-u-1-1 center-elements vert-70 status-code">
         <div class="pure-g">
-            <div class="pure-u-1-1 code">0x2A</div>
-            <div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
-                (1/42) installing <!--# echo var="upstream" default="website" -->
-            </div>
-            <div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
-                [######
-                <div style="top: -13px; position: relative;">
-                    <div class="loader pipe loader-0-3">|</div>
-                    <div class="loader loader-1-3">/</div>
-                    <div class="loader loader-2-3">-</div>
-                    <div class="loader loader-3-3">\</div>
-                </div>
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;] 26%
+          <div class="pure-u-1-1 code">0x2A</div>
+          <div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
+            (1/42) installing                
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
+          <div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
+            [######
+            <div style="top: -13px; position: relative;">
+              <div class="loader pipe loader-0-3">|</div>
+              <div class="loader loader-1-3">/</div>
+              <div class="loader loader-2-3">-</div>
+              <div class="loader loader-3-3">\</div>
             </div>
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;] 26%
+          </div>
         </div>
       </div>
    </div>