diff --git a/components/admin_console/__snapshots__/admin_console.test.jsx.snap b/components/admin_console/__snapshots__/admin_console.test.jsx.snap
index f64d420a7fd6..44e403f62f4d 100644
--- a/components/admin_console/__snapshots__/admin_console.test.jsx.snap
+++ b/components/admin_console/__snapshots__/admin_console.test.jsx.snap
@@ -117,6 +117,11 @@ exports[`components/AdminConsole should generate the routes 1`] = `
           path="/site_config/emoji"
           render={[Function]}
         />
+        <Route
+          key="out_of_office"
+          path="/out_of_office"
+          render={[Function]}
+        />
         <Route
           key="site_config/posts"
           path="/site_config/posts"
@@ -142,11 +147,6 @@ exports[`components/AdminConsole should generate the routes 1`] = `
           path="/authentication/email"
           render={[Function]}
         />
-        <Route
-          key="authentication/password"
-          path="/authentication/password"
-          render={[Function]}
-        />
         <Route
           key="authentication/mfa"
           path="/authentication/mfa"
diff --git a/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.jsx.snap b/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.jsx.snap
index ec49b9de4b98..2506aff653d0 100644
--- a/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.jsx.snap
+++ b/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.jsx.snap
@@ -334,6 +334,19 @@ exports[`components/AdminSidebar should match snapshot 1`] = `
           />
           <AdminSidebarSection
             key="9"
+            name="out_of_office"
+            parentLink=""
+            subsection={false}
+            title={
+              <FormattedMessage
+                defaultMessage="Out Of Office"
+                id="admin.sidebar.outOfOffice"
+                values={Object {}}
+              />
+            }
+          />
+          <AdminSidebarSection
+            key="10"
             name="site_config/posts"
             parentLink=""
             subsection={false}
@@ -346,7 +359,7 @@ exports[`components/AdminSidebar should match snapshot 1`] = `
             }
           />
           <AdminSidebarSection
-            key="10"
+            key="11"
             name="site_config/file_sharing_downloads"
             parentLink=""
             subsection={false}
@@ -359,7 +372,7 @@ exports[`components/AdminSidebar should match snapshot 1`] = `
             }
           />
           <AdminSidebarSection
-            key="11"
+            key="12"
             name="site_config/public_links"
             parentLink=""
             subsection={false}
@@ -905,6 +918,19 @@ exports[`components/AdminSidebar should match snapshot, not prevent the console
           />
           <AdminSidebarSection
             key="9"
+            name="out_of_office"
+            parentLink=""
+            subsection={false}
+            title={
+              <FormattedMessage
+                defaultMessage="Out Of Office"
+                id="admin.sidebar.outOfOffice"
+                values={Object {}}
+              />
+            }
+          />
+          <AdminSidebarSection
+            key="10"
             name="site_config/posts"
             parentLink=""
             subsection={false}
@@ -917,7 +943,7 @@ exports[`components/AdminSidebar should match snapshot, not prevent the console
             }
           />
           <AdminSidebarSection
-            key="10"
+            key="11"
             name="site_config/file_sharing_downloads"
             parentLink=""
             subsection={false}
@@ -930,7 +956,7 @@ exports[`components/AdminSidebar should match snapshot, not prevent the console
             }
           />
           <AdminSidebarSection
-            key="11"
+            key="12"
             name="site_config/public_links"
             parentLink=""
             subsection={false}
@@ -1469,6 +1495,19 @@ exports[`components/AdminSidebar should match snapshot, not render the plugin in
           />
           <AdminSidebarSection
             key="9"
+            name="out_of_office"
+            parentLink=""
+            subsection={false}
+            title={
+              <FormattedMessage
+                defaultMessage="Out Of Office"
+                id="admin.sidebar.outOfOffice"
+                values={Object {}}
+              />
+            }
+          />
+          <AdminSidebarSection
+            key="10"
             name="site_config/posts"
             parentLink=""
             subsection={false}
@@ -1481,7 +1520,7 @@ exports[`components/AdminSidebar should match snapshot, not render the plugin in
             }
           />
           <AdminSidebarSection
-            key="10"
+            key="11"
             name="site_config/file_sharing_downloads"
             parentLink=""
             subsection={false}
@@ -1494,7 +1533,7 @@ exports[`components/AdminSidebar should match snapshot, not render the plugin in
             }
           />
           <AdminSidebarSection
-            key="11"
+            key="12"
             name="site_config/public_links"
             parentLink=""
             subsection={false}
@@ -2138,6 +2177,19 @@ exports[`components/AdminSidebar should match snapshot, with license (with all f
           />
           <AdminSidebarSection
             key="9"
+            name="out_of_office"
+            parentLink=""
+            subsection={false}
+            title={
+              <FormattedMessage
+                defaultMessage="Out Of Office"
+                id="admin.sidebar.outOfOffice"
+                values={Object {}}
+              />
+            }
+          />
+          <AdminSidebarSection
+            key="10"
             name="site_config/posts"
             parentLink=""
             subsection={false}
@@ -2150,7 +2202,7 @@ exports[`components/AdminSidebar should match snapshot, with license (with all f
             }
           />
           <AdminSidebarSection
-            key="10"
+            key="11"
             name="site_config/file_sharing_downloads"
             parentLink=""
             subsection={false}
@@ -2163,7 +2215,7 @@ exports[`components/AdminSidebar should match snapshot, with license (with all f
             }
           />
           <AdminSidebarSection
-            key="11"
+            key="12"
             name="site_config/public_links"
             parentLink=""
             subsection={false}
@@ -2847,6 +2899,19 @@ exports[`components/AdminSidebar should match snapshot, with license (without an
           />
           <AdminSidebarSection
             key="9"
+            name="out_of_office"
+            parentLink=""
+            subsection={false}
+            title={
+              <FormattedMessage
+                defaultMessage="Out Of Office"
+                id="admin.sidebar.outOfOffice"
+                values={Object {}}
+              />
+            }
+          />
+          <AdminSidebarSection
+            key="10"
             name="site_config/posts"
             parentLink=""
             subsection={false}
@@ -2859,7 +2924,7 @@ exports[`components/AdminSidebar should match snapshot, with license (without an
             }
           />
           <AdminSidebarSection
-            key="10"
+            key="11"
             name="site_config/file_sharing_downloads"
             parentLink=""
             subsection={false}
@@ -2872,7 +2937,7 @@ exports[`components/AdminSidebar should match snapshot, with license (without an
             }
           />
           <AdminSidebarSection
-            key="11"
+            key="12"
             name="site_config/public_links"
             parentLink=""
             subsection={false}
diff --git a/components/channel_layout/center_channel/center_channel.jsx b/components/channel_layout/center_channel/center_channel.jsx
index 889392a769ed..6933313cbda9 100644
--- a/components/channel_layout/center_channel/center_channel.jsx
+++ b/components/channel_layout/center_channel/center_channel.jsx
@@ -6,6 +6,8 @@ import PropTypes from 'prop-types';
 import {Route, Switch, Redirect} from 'react-router-dom';
 import classNames from 'classnames';
 
+import $ from 'jquery';
+
 import PermalinkView from 'components/permalink_view';
 import ChannelHeaderMobile from 'components/channel_header_mobile';
 import ChannelIdentifierRouter from 'components/channel_layout/channel_identifier_router';
@@ -31,6 +33,11 @@ export default class CenterChannel extends React.PureComponent {
         if (this.props.location.pathname !== nextProps.location.pathname && nextProps.location.pathname.includes('/pl/')) {
             this.setState({returnTo: this.props.location.pathname});
         }
+        this.leftMargin = $('#app-content').css('margin-left');
+    }
+
+    componentDidUpdate() {
+        $('#app-content').css('margin-left', this.leftMargin);
     }
 
     render() {
diff --git a/components/channel_view/channel_view.jsx b/components/channel_view/channel_view.jsx
index d1552d492734..a875e8c888fa 100644
--- a/components/channel_view/channel_view.jsx
+++ b/components/channel_view/channel_view.jsx
@@ -72,6 +72,7 @@ export default class ChannelView extends React.PureComponent {
         if (this.props.match.url !== nextProps.match.url) {
             this.createDeferredPostView();
         }
+        this.leftMargin = $('#app-content').css('margin-left');
     }
 
     getChannelView = () => {
@@ -105,6 +106,7 @@ export default class ChannelView extends React.PureComponent {
                 this.props.actions.goToLastViewedChannel();
             }
         }
+        $('#app-content').css('margin-left', this.leftMargin);
     }
 
     render() {
diff --git a/components/permalink_view/permalink_view.jsx b/components/permalink_view/permalink_view.jsx
index e9fbe84e0548..fdaaed2d2926 100644
--- a/components/permalink_view/permalink_view.jsx
+++ b/components/permalink_view/permalink_view.jsx
@@ -6,6 +6,8 @@ import PropTypes from 'prop-types';
 import {FormattedMessage, intlShape} from 'react-intl';
 import {Link} from 'react-router-dom';
 
+import $ from 'jquery';
+
 import ChannelHeader from 'components/channel_header';
 import PostView from 'components/post_view';
 import FormattedMarkdownMessage from 'components/formatted_markdown_message';
@@ -53,6 +55,11 @@ export default class PermalinkView extends React.PureComponent {
         if (this.props.match.params.postid !== nextProps.match.params.postid) {
             this.doPermalinkEvent(nextProps);
         }
+        this.leftMargin = $('#app-content').css('margin-left');
+    }
+
+    componentDidUpdate() {
+        $('#app-content').css('margin-left', this.leftMargin);
     }
 
     doPermalinkEvent = async (props) => {