diff --git a/web/packages/teleport/src/Account/ChangePassword/ChangePassword.tsx b/web/packages/teleport/src/Account/ChangePassword/ChangePassword.tsx
index b39a251c24b1..76530ee649af 100644
--- a/web/packages/teleport/src/Account/ChangePassword/ChangePassword.tsx
+++ b/web/packages/teleport/src/Account/ChangePassword/ChangePassword.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import { Text } from 'design';
+import { Text, Box } from 'design';
 import PasswordForm from 'shared/components/FormPassword';
 import useChangePassword, { State } from './useChangePassword';
 
@@ -31,7 +31,7 @@ export function ChangePassword({
   auth2faType,
 }: State) {
   return (
-    <>
+    <Box mt={3}>
       <Text typography="h3" mb={3}>
         Change Password
       </Text>
@@ -41,6 +41,6 @@ export function ChangePassword({
         onChangePass={changePassword}
         onChangePassWithWebauthn={changePasswordWithWebauthn}
       />
-    </>
+    </Box>
   );
 }
diff --git a/web/packages/teleport/src/stores/index.ts b/web/packages/teleport/src/stores/index.ts
index 6520457e758e..493c41b542ef 100644
--- a/web/packages/teleport/src/stores/index.ts
+++ b/web/packages/teleport/src/stores/index.ts
@@ -1,3 +1,3 @@
-import StoreNav from './storeNav';
+import StoreNav, { defaultNavState } from './storeNav';
 import StoreUserContext from './storeUserContext';
-export { StoreNav, StoreUserContext };
+export { StoreNav, StoreUserContext, defaultNavState };
diff --git a/web/packages/teleport/src/stores/storeNav.ts b/web/packages/teleport/src/stores/storeNav.ts
index 2be61915bc0e..d2af7d74e8d7 100644
--- a/web/packages/teleport/src/stores/storeNav.ts
+++ b/web/packages/teleport/src/stores/storeNav.ts
@@ -17,15 +17,15 @@ limitations under the License.
 import { Store } from 'shared/libs/stores';
 import { NavGroup } from 'teleport/types';
 
-const defaultState = {
+export const defaultNavState = {
   sideNav: [] as NavItem[],
   topNav: [] as NavItem[],
   topMenu: [] as NavItem[],
 };
 
-export default class StoreNav extends Store<typeof defaultState> {
+export default class StoreNav extends Store<typeof defaultNavState> {
   state = {
-    ...defaultState,
+    ...defaultNavState,
   };
 
   addTopMenuItem(item: NavItem) {
diff --git a/web/packages/teleport/src/teleportContext.tsx b/web/packages/teleport/src/teleportContext.tsx
index 260753f496d2..cd959c6a275e 100644
--- a/web/packages/teleport/src/teleportContext.tsx
+++ b/web/packages/teleport/src/teleportContext.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { StoreNav, StoreUserContext } from './stores';
+import { StoreNav, StoreUserContext, defaultNavState } from './stores';
 import cfg from 'teleport/config';
 import * as types from './types';
 import AuditService from './services/audit';
@@ -57,7 +57,9 @@ class TeleportContext implements types.Context {
 
   init() {
     return userService.fetchUserContext().then(user => {
+      this.storeNav.setState(defaultNavState);
       this.storeUser.setState(user);
+      this.features = [];
     });
   }
 
diff --git a/web/packages/webapps.e b/web/packages/webapps.e
index 4d9573180397..b0275d1e5f74 160000
--- a/web/packages/webapps.e
+++ b/web/packages/webapps.e
@@ -1 +1 @@
-Subproject commit 4d9573180397badeb0364023b73fe1f840c8cf77
+Subproject commit b0275d1e5f743a947a25641a6713ab56a533f7c0