diff --git a/client/ui/mainwindow.cpp b/client/ui/mainwindow.cpp
index cdf87c98..464e1b95 100644
--- a/client/ui/mainwindow.cpp
+++ b/client/ui/mainwindow.cpp
@@ -185,6 +185,15 @@ void MainWindow::goToPage(Page page, bool reset, bool slide)
         }
         if (page == Page::ShareConnection) {
 
+        }
+        if (page == Page::Wizard) {
+            ui->radioButton_setup_wizard_medium->setChecked(true);
+        }
+        if (page == Page::WizardHigh) {
+            ui->lineEdit_setup_wizard_high_website_masking->setText(protocols::cloak::defaultRedirSite);
+        }
+        if (page == Page::ServerConfiguring) {
+            ui->progressBar_new_server_configuring->setValue(0);
         }
         if (page == Page::ServersList) {
             updateServersListPage();
@@ -1041,8 +1050,8 @@ void MainWindow::setupWizardConnections()
     connect(ui->pushButton_new_server_advanced, &QPushButton::clicked, this, [this](){ goToPage(Page::NewServerProtocols); });
     connect(ui->pushButton_setup_wizard_next, &QPushButton::clicked, this, [this](){
         if (ui->radioButton_setup_wizard_high->isChecked()) goToPage(Page::WizardHigh);
-        if (ui->radioButton_setup_wizard_medium->isChecked()) goToPage(Page::WizardMedium);
-        if (ui->radioButton_setup_wizard_low->isChecked()) goToPage(Page::WizardLow);
+        else if (ui->radioButton_setup_wizard_medium->isChecked()) goToPage(Page::WizardMedium);
+        else if (ui->radioButton_setup_wizard_low->isChecked()) goToPage(Page::WizardLow);
     });
 
     connect(ui->pushButton_setup_wizard_high_next, &QPushButton::clicked, this, [this](){
@@ -1070,6 +1079,10 @@ void MainWindow::setupWizardConnections()
     connect(ui->pushButton_setup_wizard_low_finish, &QPushButton::clicked, this, [this](){
         installServer(getInstallConfigsFromWizardPage());
     });
+
+    connect(ui->lineEdit_setup_wizard_high_website_masking, &QLineEdit::returnPressed, this, [this](){
+        ui->pushButton_setup_wizard_high_next->click();
+    });
 }
 
 void MainWindow::setupAppSettingsConnections()
@@ -1097,7 +1110,6 @@ void MainWindow::setupAppSettingsConnections()
         Debug::openLogsFolder();
         QDesktopServices::openUrl(QUrl::fromLocalFile(Utils::systemLogPath()));
     });
-
 }
 
 void MainWindow::setupGeneralSettingsConnections()
diff --git a/client/ui/mainwindow.ui b/client/ui/mainwindow.ui
index cb51c430..5b5fee23 100644
--- a/client/ui/mainwindow.ui
+++ b/client/ui/mainwindow.ui
@@ -291,7 +291,7 @@ QPushButton:hover {
       <string notr="true"/>
      </property>
      <property name="currentIndex">
-      <number>13</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="page_start">
       <widget class="QLabel" name="label_25">
@@ -5397,8 +5397,8 @@ QToolBox::tab:hover {
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>360</width>
-          <height>360</height>
+          <width>100</width>
+          <height>30</height>
          </rect>
         </property>
         <property name="styleSheet">
@@ -5525,8 +5525,8 @@ background: #282932;
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>360</width>
-          <height>360</height>
+          <width>100</width>
+          <height>30</height>
          </rect>
         </property>
         <attribute name="label">
@@ -5685,8 +5685,8 @@ background: #282932;
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>360</width>
-          <height>360</height>
+          <width>100</width>
+          <height>30</height>
          </rect>
         </property>
         <attribute name="label">
@@ -5851,8 +5851,8 @@ background: #282932;
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>360</width>
-          <height>360</height>
+          <width>100</width>
+          <height>30</height>
          </rect>
         </property>
         <property name="styleSheet">
@@ -6075,8 +6075,8 @@ color: #15CDCB;
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>360</width>
-          <height>360</height>
+          <width>100</width>
+          <height>30</height>
          </rect>
         </property>
         <attribute name="label">