diff --git a/src/gui/src/UI/UIWindowLogin.js b/src/gui/src/UI/UIWindowLogin.js
index 2435b5154..241595db5 100644
--- a/src/gui/src/UI/UIWindowLogin.js
+++ b/src/gui/src/UI/UIWindowLogin.js
@@ -274,8 +274,9 @@ async function UIWindowLogin (options) {
         let h = '';
         h += '<div style="max-width:100%; width:100%; height:100%; min-height:0; box-sizing:border-box; display:flex; flex-direction:column; justify-content:center; align-items:stretch; padding:0; overflow:auto; color:var(--color-text);">';
         // logo
+        const logo_clickable = !!options.window_options?.cover_page;
         h += '<div class="logo-wrapper" style="display:flex; justify-content:center; padding:20px 20px 0 20px; margin-bottom: 0;">';
-        h += `<img src="${window.icons['logo-white.svg']}" style="width: 40px; height: 40px; margin: 0 auto; display: block; padding: 15px; background-color: blue; border-radius: 5px;">`;
+        h += `<img src="${window.icons['logo-white.svg']}" class="auth-logo" style="width: 40px; height: 40px; margin: 0 auto; display: block; padding: 15px; background-color: blue; border-radius: 5px;${logo_clickable ? ' cursor: pointer;' : ''}">`;
         h += '</div>';
         // title
         h += '<div style="padding:10px 20px; text-align:center; margin-bottom:0;">';
@@ -377,6 +378,12 @@ async function UIWindowLogin (options) {
             },
         });
 
+        if ( logo_clickable ) {
+            $(el_window).find('.auth-logo').on('click', function () {
+                window.location.href = '/';
+            });
+        }
+
         $(el_window).find('.forgot-password-link').on('click', function (e) {
             UIWindowRecoverPassword({
                 window_options: {
diff --git a/src/gui/src/UI/UIWindowSignup.js b/src/gui/src/UI/UIWindowSignup.js
index 30d931a4c..61bdb3b87 100644
--- a/src/gui/src/UI/UIWindowSignup.js
+++ b/src/gui/src/UI/UIWindowSignup.js
@@ -32,10 +32,12 @@ function UIWindowSignup (options) {
     return new Promise(async (resolve) => {
         const internal_id = window.uuidv4();
 
+        const logo_clickable = !!options.window_options?.cover_page;
+
         let h = '';
         h += '<div style="margin: 0 auto; max-width: 500px; min-width: 400px;">';
         // logo
-        h += `<img src="${window.icons['logo-white.svg']}" style="width: 40px; height: 40px; margin: 0 auto; display: block; padding: 10px; background-color: blue; border-radius: 5px;">`;
+        h += `<img src="${window.icons['logo-white.svg']}" class="auth-logo" style="width: 40px; height: 40px; margin: 0 auto; display: block; padding: 10px; background-color: blue; border-radius: 5px;${logo_clickable ? ' cursor: pointer;' : ''}">`;
         // close button
         if ( !options.has_head && options.show_close_button !== false )
         {
@@ -142,6 +144,11 @@ function UIWindowSignup (options) {
                 {
                     $(el_window).find('.username').get(0).focus({ preventScroll: true });
                 }
+                if ( logo_clickable ) {
+                    $(el_window).find('.auth-logo').on('click', function () {
+                        window.location.href = '/';
+                    });
+                }
 
                 // Initialize Turnstile widget with callback to capture token
                 const initTurnstile = () => {