diff --git a/src/confighttp.cpp b/src/confighttp.cpp
index e25e357e..ac748647 100644
--- a/src/confighttp.cpp
+++ b/src/confighttp.cpp
@@ -47,7 +47,7 @@ using namespace std::literals;
 namespace confighttp {
   namespace fs = std::filesystem;
   namespace pt = boost::property_tree;
-  
+
   std::string jwt_key;
 
   using https_server_t = SimpleWeb::Server<SimpleWeb::HTTPS>;
@@ -67,7 +67,7 @@ namespace confighttp {
     BOOST_LOG(debug) << "DESTINATION :: "sv << request->path;
 
     for (auto &[name, val] : request->header) {
-      BOOST_LOG(debug) << name << " -- " << (name == "Cookie" ? "COOKIES REDACTED" : val);
+      BOOST_LOG(debug) << name << " -- " << (name == "Cookie" || name == "Authorization" ? "SENSIBLE HEADER REDACTED" : val);
     }
 
     BOOST_LOG(debug) << " [--] "sv;
@@ -120,7 +120,8 @@ namespace confighttp {
       if (request->path.compare(0, apiPrefix.length(), apiPrefix) == 0) {
         send_unauthorized(response, request);
       }
-      else {
+      // Redirect to login, but only once
+      else if (request->path.compare("/login") != 0) {
         send_redirect(response, request, "/login");
       }
     });
@@ -135,7 +136,6 @@ namespace confighttp {
     std::string token, cookie_name = "sunshine_session=", cookie_value = "";
 
     while (std::getline(iss, token, ';')) {
-      BOOST_LOG(info) << token;
       // Left Trim Cookie
       token.erase(token.begin(), std::find_if(token.begin(), token.end(), [](unsigned char ch) {
         return !std::isspace(ch);
@@ -143,13 +143,11 @@ namespace confighttp {
       // Compare that the cookie name is sunshine_session
       if (token.compare(0, cookie_name.length(), cookie_name) == 0) {
         cookie_value = token.substr(cookie_name.length());
-        BOOST_LOG(info) << cookie_value;
         break;
       }
     }
 
     if (cookie_value.length() == 0) return false;
-    BOOST_LOG(info) << "JWT: " << cookie_value;
     auto decoded = jwt::decode(cookie_value);
     auto verifier = jwt::verify()
                       .with_issuer("sunshine-" + http::unique_id)
@@ -667,6 +665,8 @@ namespace confighttp {
           else {
             http::save_user_creds(config::sunshine.credentials_file, newUsername, newPassword);
             http::reload_user_creds(config::sunshine.credentials_file);
+            //Regen the JWT Key to invalidate sessions
+            jwt_key = crypto::rand_alphabet(64);
             outputTree.put("status", true);
           }
         }
@@ -809,11 +809,45 @@ namespace confighttp {
     outputTree.put("status", "true");
   }
 
+  void
+  logout(resp_https_t response, req_https_t request) {
+    pt::ptree outputTree;
+    try {
+      if (!authenticate(response, request)) return;
+
+      print_req(request);
+
+
+      auto g = util::fail_guard([&]() {
+        std::ostringstream data;
+        pt::write_json(data, outputTree);
+        response->write(data.str());
+      });
+
+      const SimpleWeb::CaseInsensitiveMultimap headers {
+        { "Set-Cookie", "sunshine_session=redacted; expires=Thu, 01 Jan 1970 00:00:00 GMT; Secure; HttpOnly; SameSite=Strict; Path=/" }
+      };
+      std::ostringstream data;
+      outputTree.put("status", true);
+      pt::write_json(data, outputTree);
+
+      response->write(SimpleWeb::StatusCode::success_ok, data.str(), headers);
+      g.disable();
+    }
+    catch (std::exception &e) {
+      BOOST_LOG(warning) << "SaveApp: "sv << e.what();
+
+      outputTree.put("status", "false");
+      outputTree.put("error", "Invalid Input JSON");
+      return;
+    }
+  }
+
   void
   start() {
     auto shutdown_event = mail::man->event<bool>(mail::shutdown);
 
-    //On each server start, create a randomized jwt_key
+    // On each server start, create a randomized jwt_key
     jwt_key = crypto::rand_alphabet(64);
 
     auto port_https = net::map_port(PORT_HTTPS);
@@ -842,6 +876,7 @@ namespace confighttp {
     server.resource["^/api/clients/unpair$"]["POST"] = unpairAll;
     server.resource["^/api/apps/close$"]["POST"] = closeApp;
     server.resource["^/api/covers/upload$"]["POST"] = uploadCover;
+        server.resource["^/api/logout$"]["POST"] = logout;
     server.resource["^/api/login$"]["POST"] = login;
     server.resource["^/images/sunshine.ico$"]["GET"] = getFaviconImage;
     server.resource["^/images/logo-sunshine-45.png$"]["GET"] = getSunshineLogoImage;
diff --git a/src_assets/common/assets/web/Navbar.vue b/src_assets/common/assets/web/Navbar.vue
index ec656563..6ba166d9 100644
--- a/src_assets/common/assets/web/Navbar.vue
+++ b/src_assets/common/assets/web/Navbar.vue
@@ -29,6 +29,11 @@
                         <a class="nav-link" href="/troubleshooting"><i class="fas fa-fw fa-info"></i> Troubleshooting</a>
                     </li>
                 </ul>
+                <ul  class="navbar-nav mb-2 mb-lg-0">
+                    <li class="nav-item">
+                        <a class="nav-link" href="#" @click="logout"><i class="fas fa-fw fa-right-from-bracket"></i> Logout</a>
+                    </li>
+                </ul>
             </div>
         </div>
     </nav>
@@ -74,6 +79,11 @@ export default {
     methods: {
         onLogin(){
             this.modal.toggle();
+        },
+        logout(){
+            fetch("/api/logout",{method: "POST"}).then(r => {
+                document.location.href = '/';
+            })
         }
     }
 }
diff --git a/src_assets/common/assets/web/login.html b/src_assets/common/assets/web/login.html
index 0e19e19a..863fa98e 100644
--- a/src_assets/common/assets/web/login.html
+++ b/src_assets/common/assets/web/login.html
@@ -8,14 +8,16 @@
 <body id="app">
   <main role="main" style="max-width: 1200px; margin: 1em auto">
     <div class="d-flex justify-content-center gap-4">
-      <div class="card p-4">
+      <div class="p-4 card">
         <header>
-          <h1 class="mb-0">
+          <h1 class="mb-2">
             <img src="/images/logo-sunshine-45.png" height="45" alt="" style="vertical-align: bottom;">
-            Welcome to Sunshine!
+            Hello, Sunshine!
           </h1>
         </header>
         <Login-Form @loggedin="onLogin"></Login-Form>
+      </div>
+      <div>
         <Resource-Card />
       </div>
     </div>
@@ -31,13 +33,13 @@
       'ResourceCard': ResourceCard,
       'LoginForm': LoginForm
     },
-    data(){
+    data() {
       return {
         a: 1
       }
     },
-    mounted(){
-      console.log("Ciao!",this.$el)
+    mounted() {
+      console.log("Ciao!", this.$el)
     },
     methods: {
       onLogin() {
@@ -45,6 +47,6 @@
       }
     }
   });
-  console.log("App",app);
+  console.log("App", app);
   app.mount("#app");
 </script>
\ No newline at end of file