diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json
index e388081504..cb08387ef2 100644
--- a/scm-ui/public/locales/en/users.json
+++ b/scm-ui/public/locales/en/users.json
@@ -36,6 +36,7 @@
   "single-user": {
     "navigationLabel": "User Navigation",
     "informationNavLink": "Information",
+    "settingsNavLink": "Settings",
     "editNavLink": "Edit",
     "setPasswordNavLink": "Set password",
     "errorTitle": "Error",
diff --git a/scm-ui/src/containers/Profile.js b/scm-ui/src/containers/Profile.js
index e603a565e8..2ad78d3527 100644
--- a/scm-ui/src/containers/Profile.js
+++ b/scm-ui/src/containers/Profile.js
@@ -76,7 +76,7 @@ class Profile extends React.Component<Props, State> {
                   label={t("profile.informationNavLink")}
                 />
                 <SubNavigation
-                  to={`${url}/settings/password`}
+                  to={`${url}/settings`}
                   label={t("profile.settingsNavLink")}
                 >
                   <NavLink
diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js
index 1662d213c5..c8e3990f6d 100644
--- a/scm-ui/src/users/containers/SingleUser.js
+++ b/scm-ui/src/users/containers/SingleUser.js
@@ -5,6 +5,7 @@ import {
   Page,
   Loading,
   Navigation,
+  SubNavigation,
   Section,
   NavLink,
   ErrorPage
@@ -99,11 +100,11 @@ class SingleUser extends React.Component<Props> {
           <div className="column is-three-quarters">
             <Route path={url} exact component={() => <Details user={user} />} />
             <Route
-              path={`${url}/edit`}
+              path={`${url}/settings/edit`}
               component={() => <EditUser user={user} />}
             />
             <Route
-              path={`${url}/password`}
+              path={`${url}/settings/password`}
               component={() => <SetUserPassword user={user} />}
             />
           </div>
@@ -114,11 +115,16 @@ class SingleUser extends React.Component<Props> {
                   to={`${url}`}
                   label={t("single-user.informationNavLink")}
                 />
-                <EditUserNavLink user={user} editUrl={`${url}/edit`} />
-                <SetPasswordNavLink
-                  user={user}
-                  passwordUrl={`${url}/password`}
-                />
+                <SubNavigation
+                  to={`${url}/settings`}
+                  label={t("single-user.settingsNavLink")}
+                >
+                  <EditUserNavLink user={user} editUrl={`${url}/settings/edit`} />
+                  <SetPasswordNavLink
+                    user={user}
+                    passwordUrl={`${url}/settings/password`}
+                  />
+                </SubNavigation>
               </Section>
             </Navigation>
           </div>