diff --git a/src/gui/src/UI/UIWindowEmailConfirmationRequired.js b/src/gui/src/UI/UIWindowEmailConfirmationRequired.js
index e1ef4befe..c9fb615ec 100644
--- a/src/gui/src/UI/UIWindowEmailConfirmationRequired.js
+++ b/src/gui/src/UI/UIWindowEmailConfirmationRequired.js
@@ -30,7 +30,9 @@ function UIWindowEmailConfirmationRequired (options) {
         const submit_btn_txt = 'Confirm Email';
 
         let h = '';
-        h += '<div class="qr-code-window-close-btn generic-close-window-button"> &times; </div>';
+        if(options.show_close_button !== false) {
+            h += '<div class="qr-code-window-close-btn generic-close-window-button"> &times; </div>';
+        }
         h += '<div style="-webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; color: #3e5362; max-width: 350px; margin: 0 auto;">';
         h += `<img src="${html_encode(window.icons['mail.svg'])}" style="display:block; margin:10px auto 10px;">`;
         h += `<h3 style="text-align:center; font-weight: 500; font-size: 20px;">${i18n('confirm_your_email_address')}</h3>`;
diff --git a/src/gui/src/initgui.js b/src/gui/src/initgui.js
index 1093c18cc..d1fada39d 100644
--- a/src/gui/src/initgui.js
+++ b/src/gui/src/initgui.js
@@ -455,7 +455,7 @@ window.initgui = async function (options) {
             // show signup window
             if ( await UIWindowSignup({
                 reload_on_success: false,
-                send_confirmation_code: false,
+                send_confirmation_code: true,
                 show_close_button: false,
                 window_options: {
                     has_head: false,
@@ -593,6 +593,7 @@ window.initgui = async function (options) {
         if ( ! window.is_auth() ) {
             opts.window_options = { cover_page: true, has_head: false };
         }
+        opts.send_confirmation_code = true;
         await UIWindowSignup(Object.keys(opts).length ? opts : undefined);
     }
     // -------------------------------------------------------------------------------------
@@ -642,6 +643,7 @@ window.initgui = async function (options) {
                 let is_verified;
                 do {
                     is_verified = await UIWindowEmailConfirmationRequired({
+                        show_close_button: false,
                         stay_on_top: true,
                         has_head: false,
                         window_options: {
@@ -810,6 +812,7 @@ window.initgui = async function (options) {
                 let is_verified;
                 do {
                     is_verified = await UIWindowEmailConfirmationRequired({
+                        show_close_button: false,
                         stay_on_top: true,
                         has_head: false,
                         logout_in_footer: true,
@@ -1287,7 +1290,7 @@ window.initgui = async function (options) {
 
                         await UIWindowSignup({
                             reload_on_success: !window.embedded_in_popup,
-                            send_confirmation_code: false,
+                            send_confirmation_code: true,
                             window_options: {
                                 has_head: false,
                                 cover_page: true,