diff --git a/app/main.py b/app/main.py
index 1bb6e8a..0925dd6 100644
--- a/app/main.py
+++ b/app/main.py
@@ -27,7 +27,7 @@ def profile():
     return render_template('main/profile.jinja2')
 
 
-@main_blueprint.route('/signed-out')
+@main_blueprint.route('/user/signed-out')
 def signed_out():
     """Sign out landing page"""
-    return render_template('main/signed_out.jinja2')
+    return render_template('flask_user/signed_out.html')
diff --git a/app/templates/flask_user/_common_base.html b/app/templates/flask_user/_common_base.html
index bead9e2..2863df9 100644
--- a/app/templates/flask_user/_common_base.html
+++ b/app/templates/flask_user/_common_base.html
@@ -12,8 +12,6 @@
     </style>
 {% endblock %}
 
-
-
 {% block content_before %}
     <div class="container-fluid h-100">
         <div class="row h-100 justify-content-center align-items-center">
@@ -27,7 +25,6 @@
                     </div>
 
                     <div class="card-body d-flex flex-column m-2">
-
                         {% with messages = get_flashed_messages() %}
 
                             <h3 {% if not messages %}class="mb-4"{% endif %}>
@@ -35,11 +32,13 @@
                             </h3>
 
                             {# Show any errors #}
-                            {% for message in messages %}
-                                <div class="alert alert-warning" role="alert">
-                                    {{ message }}
-                                </div>
-                            {% endfor %}
+                            {% if not disable_messages %}
+                                {% for message in messages %}
+                                    <div class="alert alert-warning" role="alert">
+                                        {{ message }}
+                                    </div>
+                                {% endfor %}
+                            {% endif %}
 
                         {% endwith %}
 
diff --git a/app/templates/flask_user/login.html b/app/templates/flask_user/login.html
index bcfcda0..bd0e91a 100644
--- a/app/templates/flask_user/login.html
+++ b/app/templates/flask_user/login.html
@@ -1,8 +1,8 @@
 {% extends 'flask_user/_public_base.html' %}
 {% from "flask_user/_macros.html" import render_field, render_checkbox_field, render_submit_field %}
 
-{% block title %}Login{% endblock %}
-{% block form_title %}Login{% endblock %}
+{% block title %}Sign in{% endblock %}
+{% block form_title %}Sign in{% endblock %}
 
 {% block form %}
 
diff --git a/app/templates/flask_user/signed_out.html b/app/templates/flask_user/signed_out.html
new file mode 100644
index 0000000..940172c
--- /dev/null
+++ b/app/templates/flask_user/signed_out.html
@@ -0,0 +1,17 @@
+{% extends 'flask_user/_common_base.html' %}
+
+{% block title %}Signed out{% endblock %}
+{% block form_title %}{% endblock %}
+
+{% set disable_messages = True %}
+
+{% block form %}
+  <div class="text-center">
+    <h3>
+      You are now signed out
+    </h3>
+    <p class="mb-5">
+      Please close your browser.
+    </p>
+  </div>
+{% endblock %}
diff --git a/app/templates/main/signed_out.jinja2 b/app/templates/main/signed_out.jinja2
deleted file mode 100644
index c3ad74d..0000000
--- a/app/templates/main/signed_out.jinja2
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends 'base.jinja2' %}
-
-{% block title %}Logout{% endblock %}
-{% block header %}{% endblock %}
-
-{% block css %}
-  {{ super() }}
-  {# override the body and html css to force center #}
-  <style>
-    html, body {
-      height: 100%;
-      background-color: #777777;
-    }
-  </style>
-{% endblock %}
-
-{% block content_before %}
-  <div class="container-fluid h-100">
-    <div class="row h-100 justify-content-center align-items-center">
-      <div class="mx-auto" style="max-width: 30em;">
-
-        {# Splash card #}
-        <div class="card shadow rounded border-0 h-100">
-          <div class="card-header bg-primary pt-4 text-center text-white mb-4">
-            <img class="img-fluid mb-3" src="http://lib.msstate.edu/_assets/img/2015-header-logo-msstate.png"
-                 alt=""/>
-            <h5>Electronic Thesis and Dissertation System</h5>
-          </div>
-
-          <div class="card-body d-flex flex-column text-center mb-2">
-            <h3>
-              You are now logged out
-            </h3>
-            <p class="mb-5">
-              Please close your browser.
-            </p>
-          </div>
-        </div>
-
-      </div>
-    </div>
-  </div>
-{% endblock %}