diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsCustomization/portal-renaming.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsCustomization/portal-renaming.js
index 6300380abd..55488c4fd3 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsCustomization/portal-renaming.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsCustomization/portal-renaming.js
@@ -37,12 +37,22 @@ const PortalRenaming = (props) => {
     "portalNameDefault"
   );
 
-  const [portalName, setPortalName] = useState(
-    portalNameFromSessionStorage || tenantAlias
-  );
+  const portalNameInitially =
+    portalNameFromSessionStorage === null ||
+    portalNameFromSessionStorage === "none"
+      ? tenantAlias
+      : portalNameFromSessionStorage;
+
+  const portalNameDefaultInitially =
+    portalNameDefaultFromSessionStorage === null ||
+    portalNameDefaultFromSessionStorage === "none"
+      ? tenantAlias
+      : portalNameDefaultFromSessionStorage;
+
+  const [portalName, setPortalName] = useState(portalNameInitially);
 
   const [portalNameDefault, setPortalNameDefault] = useState(
-    portalNameDefaultFromSessionStorage || tenantAlias
+    portalNameDefaultInitially
   );
 
   const [isLoadingPortalNameSave, setIsLoadingPortalNameSave] = useState(false);
@@ -90,10 +100,10 @@ const PortalRenaming = (props) => {
   useEffect(() => {
     if (isLoadedSetting) setIsLoadedPortalRenaming(isLoadedSetting);
 
-    if (portalNameDefault) {
+    if (portalNameDefault || portalName) {
       checkChanges();
     }
-  }, [isLoadedSetting, portalNameDefault]);
+  }, [isLoadedSetting, portalNameDefault, portalName]);
 
   const onSavePortalRename = () => {
     if (errorValue) return;
@@ -124,11 +134,12 @@ const PortalRenaming = (props) => {
     setErrorValue(null);
 
     if (
-      portalNameFromSessionStorage &&
+      portalNameFromSessionStorage !== "none" &&
+      portalNameFromSessionStorage !== null &&
       !settingIsEqualInitialValue(portalNameFromSessionStorage)
     ) {
       setPortalName(portalNameDefault);
-      saveToSessionStorage("portalName", "");
+      saveToSessionStorage("portalName", "none");
       setShowReminder(false);
     }
   };
@@ -141,8 +152,8 @@ const PortalRenaming = (props) => {
     setPortalName(value);
 
     if (settingIsEqualInitialValue(value)) {
-      saveToSessionStorage("portalName", "");
-      saveToSessionStorage("portalNameDefault", "");
+      saveToSessionStorage("portalName", "none");
+      saveToSessionStorage("portalNameDefault", "none");
     } else {
       saveToSessionStorage("portalName", value);
     }
@@ -183,7 +194,8 @@ const PortalRenaming = (props) => {
 
     const valueFromSessionStorage = getFromSessionStorage("portalName");
     if (
-      valueFromSessionStorage &&
+      valueFromSessionStorage !== "none" &&
+      valueFromSessionStorage !== null &&
       !settingIsEqualInitialValue(valueFromSessionStorage)
     ) {
       hasChanged = true;
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsCustomization/welcome-page-settings.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsCustomization/welcome-page-settings.js
index db0fe3676c..d07e7b4f73 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsCustomization/welcome-page-settings.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsCustomization/welcome-page-settings.js
@@ -45,11 +45,22 @@ class WelcomePageSettings extends React.Component {
 
     setDocumentTitle(t("CustomTitlesWelcome"));
 
+    const greetingTitle =
+      greetingTitleFromSessionStorage === null ||
+      greetingTitleFromSessionStorage === "none"
+        ? greetingSettings
+        : greetingTitleFromSessionStorage;
+
+    const greetingTitleDefault =
+      greetingTitleDefaultFromSessionStorage === null ||
+      greetingTitleDefaultFromSessionStorage === "none"
+        ? greetingSettings
+        : greetingTitleDefaultFromSessionStorage;
+
     this.state = {
       isLoading: false,
-      greetingTitle: greetingTitleFromSessionStorage || greetingSettings,
-      greetingTitleDefault:
-        greetingTitleDefaultFromSessionStorage || greetingSettings,
+      greetingTitle,
+      greetingTitleDefault,
       isLoadingGreetingSave: false,
       isLoadingGreetingRestore: false,
       hasChanged: false,
@@ -61,14 +72,14 @@ class WelcomePageSettings extends React.Component {
 
   componentDidMount() {
     const { isLoaded, setIsLoadedWelcomePageSettings, tReady } = this.props;
-    const { greetingTitleDefault } = this.state;
+    const { greetingTitleDefault, greetingTitle } = this.state;
     window.addEventListener("resize", this.checkInnerWidth);
 
     const isLoadedSetting = isLoaded && tReady;
 
     if (isLoadedSetting) setIsLoadedWelcomePageSettings(isLoadedSetting);
 
-    if (greetingTitleDefault) {
+    if (greetingTitleDefault || greetingTitle) {
       this.checkChanges();
     }
   }
@@ -106,7 +117,7 @@ class WelcomePageSettings extends React.Component {
       settingsMobile.style.display = "none";
     }
 
-    if (this.state.greetingTitleDefault) {
+    if (this.state.greetingTitleDefault || this.state.greetingTitle) {
       this.checkChanges();
     }
   }
@@ -123,8 +134,8 @@ class WelcomePageSettings extends React.Component {
     this.setState({ greetingTitle: e.target.value });
 
     if (this.settingIsEqualInitialValue("greetingTitle", e.target.value)) {
-      saveToSessionStorage("greetingTitle", "");
-      saveToSessionStorage("greetingTitleDefault", "");
+      saveToSessionStorage("greetingTitle", "none");
+      saveToSessionStorage("greetingTitleDefault", "none");
     } else {
       saveToSessionStorage("greetingTitle", e.target.value);
       this.setState({
@@ -174,7 +185,11 @@ class WelcomePageSettings extends React.Component {
             greetingTitleDefault: this.props.greetingSettings,
             showReminder: false,
           });
-          saveToSessionStorage("greetingTitle", "");
+          saveToSessionStorage("greetingTitle", this.props.greetingSettings);
+          saveToSessionStorage(
+            "greetingTitleDefault",
+            this.props.greetingSettings
+          );
           toastr.success(t("SuccessfullySaveGreetingSettingsMessage"));
         })
         .catch((error) => toastr.error(error))
@@ -194,7 +209,8 @@ class WelcomePageSettings extends React.Component {
     settingNames.forEach((settingName) => {
       const valueFromSessionStorage = getFromSessionStorage(settingName);
       if (
-        valueFromSessionStorage &&
+        valueFromSessionStorage !== "none" &&
+        valueFromSessionStorage !== null &&
         !this.settingIsEqualInitialValue(settingName, valueFromSessionStorage)
       )
         hasChanged = true;