diff --git a/management/templates/index.html b/management/templates/index.html
index 267f5dd6..492a953b 100644
--- a/management/templates/index.html
+++ b/management/templates/index.html
@@ -118,6 +118,10 @@
     </div>
 
     <div class="container">
+      <div id="panel_welcome" class="admin_panel">
+      {% include "welcome.html" %}
+      </div>
+
       <div id="panel_system_status" class="admin_panel">
       {% include "system-status.html" %}
       </div>
@@ -409,6 +413,8 @@ $(function() {
   // Recall what the user was last looking at.
   if (typeof localStorage != 'undefined' && localStorage.getItem("miab-cp-lastpanel")) {
     show_panel(localStorage.getItem("miab-cp-lastpanel"));
+  } else if (api_credentials[0] != "") {
+    show_panel('welcome');
   } else {
     show_panel('login');
   }
diff --git a/management/templates/login.html b/management/templates/login.html
index 3447d794..8ae79857 100644
--- a/management/templates/login.html
+++ b/management/templates/login.html
@@ -163,7 +163,7 @@ function do_login() {
       // Open the next panel the user wants to go to. Do this after the XHR response
       // is over so that we don't start a new XHR request while this one is finishing,
       // which confuses the loading indicator.
-      setTimeout(function() { show_panel(!switch_back_to_panel || switch_back_to_panel == "login" ? 'system_status' : switch_back_to_panel) }, 300);
+      setTimeout(function() { show_panel(!switch_back_to_panel || switch_back_to_panel == "login" ? 'welcome' : switch_back_to_panel) }, 300);
     }
   },
   undefined,
diff --git a/management/templates/welcome.html b/management/templates/welcome.html
new file mode 100644
index 00000000..124d2d28
--- /dev/null
+++ b/management/templates/welcome.html
@@ -0,0 +1,16 @@
+<style>
+  .title {
+    margin: 1em;
+    text-align: center;
+  }
+
+  .subtitle {
+    margin: 2em;
+    text-align: center;
+  }
+</style>
+
+<h1 class="title">{{hostname}}</h1>
+
+<p class="subtitle">Welcome to your Mail-in-a-Box control panel.</p>
+