diff --git a/web/ASC.Web.Client/src/components/pages/Wizard/index.js b/web/ASC.Web.Client/src/components/pages/Wizard/index.js
index 8bf999654b..b374988a64 100644
--- a/web/ASC.Web.Client/src/components/pages/Wizard/index.js
+++ b/web/ASC.Web.Client/src/components/pages/Wizard/index.js
@@ -102,7 +102,7 @@ class Body extends Component {
     } else {
       
       await Promise.all([
-        getPortalPasswordSettings(),
+        getPortalPasswordSettings(wizardToken),
         getMachineName(wizardToken),
         getPortalTimezones(wizardToken)
           .then(() => {
diff --git a/web/ASC.Web.Client/src/components/pages/Wizard/locales/en/translation.json b/web/ASC.Web.Client/src/components/pages/Wizard/locales/en/translation.json
index ca9d875aa9..8d15c57d99 100644
--- a/web/ASC.Web.Client/src/components/pages/Wizard/locales/en/translation.json
+++ b/web/ASC.Web.Client/src/components/pages/Wizard/locales/en/translation.json
@@ -17,6 +17,8 @@
   "changeEmailTitle": "Change e-mail",
   "changeEmailBtn": "Save",
 
+  "closeModalButton": "Close",
+
   "tooltipPasswordTitle": "Password must contain:",
   "tooltipPasswordLength": "characters",
   "tooltipPasswordDigits": "digits",
diff --git a/web/ASC.Web.Client/src/components/pages/Wizard/locales/ru/translation.json b/web/ASC.Web.Client/src/components/pages/Wizard/locales/ru/translation.json
index dbacd3af73..606fa6f5f7 100644
--- a/web/ASC.Web.Client/src/components/pages/Wizard/locales/ru/translation.json
+++ b/web/ASC.Web.Client/src/components/pages/Wizard/locales/ru/translation.json
@@ -17,6 +17,8 @@
   "changeEmailTitle": "Измененить адрес электронной почты",
   "changeEmailBtn": "Сохранить",
 
+  "closeModalButton": "Закрыть",
+
   "tooltipPasswordTitle": "Пароль должен содержать:",
   "tooltipPasswordLength": "символов",
   "tooltipPasswordDigits": "цыфры",
diff --git a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/modal-dialog-container.js b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/modal-dialog-container.js
index 2f911320be..b956795769 100644
--- a/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/modal-dialog-container.js
+++ b/web/ASC.Web.Client/src/components/pages/Wizard/sub-components/modal-dialog-container.js
@@ -34,7 +34,16 @@ const Modal = ({
         {errorMessage ? errorMessage: t('errorLicenseBody')}
     </span>;
 
-  } else if( visibleModal ) { //( visibleModal && isOwner )
+    footer = <Button
+    className="modal-button-save"
+    key="saveBtn"
+    label={t('closeModalButton')}
+    primary={true}
+    size="medium"
+    onClick={onCloseModal}
+    />;
+
+  } else if( visibleModal ) {
     header = t('changeEmailTitle');
 
     content = <EmailInput
diff --git a/web/ASC.Web.Client/src/store/wizard/reducer.js b/web/ASC.Web.Client/src/store/wizard/reducer.js
index 8dce268400..1b83b18708 100644
--- a/web/ASC.Web.Client/src/store/wizard/reducer.js
+++ b/web/ASC.Web.Client/src/store/wizard/reducer.js
@@ -6,7 +6,7 @@ import {
 
 const initState = { 
   isWizardLoaded: false,
-  machineName: '',
+  machineName: 'unknown',
   res: null
 };