diff --git a/scm-ui/src/groups/components/GroupForm.js b/scm-ui/src/groups/components/GroupForm.js
index 75f6e89579..8693cb9b47 100644
--- a/scm-ui/src/groups/components/GroupForm.js
+++ b/scm-ui/src/groups/components/GroupForm.js
@@ -72,12 +72,13 @@ class GroupForm extends React.Component<Props, State> {
   };
 
   render() {
-    const { t, loading } = this.props;
+    const { loading, t } = this.props;
     const { group } = this.state;
-    let firstField = null;
+    let nameField = null;
+    let subtitle = null;
     if (!this.props.group) {
       // create new group
-      firstField = (
+      nameField = (
         <InputField
           label={t("group.name")}
           errorMessage={t("groupForm.nameError")}
@@ -89,46 +90,49 @@ class GroupForm extends React.Component<Props, State> {
       );
     } else {
       // edit existing group
-      firstField = <Subtitle subtitle={t("groupForm.subtitle")} />;
+      subtitle = <Subtitle subtitle={t("groupForm.subtitle")} />;
     }
 
     return (
-      <form onSubmit={this.submit}>
-        {firstField}
-        <Textarea
-          label={t("group.description")}
-          errorMessage={t("groupForm.descriptionError")}
-          onChange={this.handleDescriptionChange}
-          value={group.description}
-          validationError={false}
-          helpText={t("groupForm.help.descriptionHelpText")}
-        />
-        <LabelWithHelpIcon
-          label={t("group.members")}
-          helpText={t("groupForm.help.memberHelpText")}
-        />
-        <MemberNameTable
-          members={group.members}
-          memberListChanged={this.memberListChanged}
-        />
+      <>
+        {subtitle}
+        <form onSubmit={this.submit}>
+          {nameField}
+          <Textarea
+            label={t("group.description")}
+            errorMessage={t("groupForm.descriptionError")}
+            onChange={this.handleDescriptionChange}
+            value={group.description}
+            validationError={false}
+            helpText={t("groupForm.help.descriptionHelpText")}
+          />
+          <LabelWithHelpIcon
+            label={t("group.members")}
+            helpText={t("groupForm.help.memberHelpText")}
+          />
+          <MemberNameTable
+            members={group.members}
+            memberListChanged={this.memberListChanged}
+          />
 
-        <AutocompleteAddEntryToTableField
-          addEntry={this.addMember}
-          disabled={false}
-          buttonLabel={t("add-member-button.label")}
-          fieldLabel={t("add-member-textfield.label")}
-          errorMessage={t("add-member-textfield.error")}
-          loadSuggestions={this.props.loadUserSuggestions}
-          placeholder={t("add-member-autocomplete.placeholder")}
-          loadingMessage={t("add-member-autocomplete.loading")}
-          noOptionsMessage={t("add-member-autocomplete.no-options")}
-        />
-        <SubmitButton
-          disabled={!this.isValid()}
-          label={t("groupForm.submit")}
-          loading={loading}
-        />
-      </form>
+          <AutocompleteAddEntryToTableField
+            addEntry={this.addMember}
+            disabled={false}
+            buttonLabel={t("add-member-button.label")}
+            fieldLabel={t("add-member-textfield.label")}
+            errorMessage={t("add-member-textfield.error")}
+            loadSuggestions={this.props.loadUserSuggestions}
+            placeholder={t("add-member-autocomplete.placeholder")}
+            loadingMessage={t("add-member-autocomplete.loading")}
+            noOptionsMessage={t("add-member-autocomplete.no-options")}
+          />
+          <SubmitButton
+            disabled={!this.isValid()}
+            label={t("groupForm.submit")}
+            loading={loading}
+          />
+        </form>
+      </>
     );
   }
 
diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index d01838f08a..bb368666d9 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -88,7 +88,9 @@ class UserForm extends React.Component<Props, State> {
 
     let nameField = null;
     let passwordChangeField = null;
+    let subtitle = null;
     if (!this.props.user) {
+      // create new user
       nameField = (
         <InputField
           label={t("user.name")}
@@ -103,10 +105,13 @@ class UserForm extends React.Component<Props, State> {
       passwordChangeField = (
         <PasswordConfirmation passwordChanged={this.handlePasswordChange} />
       );
+    } else {
+      // edit existing user
+      subtitle = <Subtitle subtitle={t("userForm.subtitle")} />;
     }
     return (
       <>
-        <Subtitle subtitle={t("userForm.subtitle")} />
+        {subtitle}
         <form onSubmit={this.submit}>
           <div className="columns">
             <div className="column is-half">
diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js
index 734d7cb209..ad95aa81ec 100644
--- a/scm-ui/src/users/containers/SingleUser.js
+++ b/scm-ui/src/users/containers/SingleUser.js
@@ -92,7 +92,7 @@ class SingleUser extends React.Component<Props> {
               component={() => <SetUserPassword user={user} />}
             />
             <Route
-              path={`${url}/permissions`}
+              path={`${url}/settings/permissions`}
               component={() => (
                 <SetPermissions
                   selectedPermissionsLink={user._links.permissions}