diff --git a/scm-ui/src/config/containers/Config.js b/scm-ui/src/config/containers/Config.js
index 63173c0b9b..61e5931e24 100644
--- a/scm-ui/src/config/containers/Config.js
+++ b/scm-ui/src/config/containers/Config.js
@@ -57,7 +57,7 @@ class Config extends React.Component<Props> {
             <Route path={url} exact component={GlobalConfig} />
             <Route
               path={`${url}/role/:role`}
-              render={() => <SingleRepositoryRole baseUrl={`${url}/roles`} />}
+              render={() => <SingleRepositoryRole baseUrl={`${url}/roles`} history={this.props.history} />}
             />
             <Route
               path={`${url}/roles`}
@@ -83,7 +83,7 @@ class Config extends React.Component<Props> {
                 />
                 <NavLink
                   to={`${url}/roles`}
-                  label={t("roles.navLink")}
+                  label={t("repositoryRole.navLink")}
                   activeWhenMatch={this.matchesRoles}
                 />
                 <ExtensionPoint
diff --git a/scm-ui/src/config/roles/components/PermissionRoleDetails.js b/scm-ui/src/config/roles/components/PermissionRoleDetails.js
index 8ca21b1ac3..fa68a66d25 100644
--- a/scm-ui/src/config/roles/components/PermissionRoleDetails.js
+++ b/scm-ui/src/config/roles/components/PermissionRoleDetails.js
@@ -4,36 +4,47 @@ import { translate } from "react-i18next";
 import type { Role } from "@scm-manager/ui-types";
 import ExtensionPoint from "@scm-manager/ui-extensions/lib/ExtensionPoint";
 import PermissionRoleDetailsTable from "./PermissionRoleDetailsTable";
-import {Button, Subtitle} from "@scm-manager/ui-components";
+import { Button, Subtitle } from "@scm-manager/ui-components";
 
 type Props = {
   role: Role,
   url: string,
 
   // context props
-  t: string => string,
+  t: string => string
 };
 
 class PermissionRoleDetails extends React.Component<Props> {
+  renderEditButton() {
+    const { t, url } = this.props;
+    if (!!this.props.role._links.update) {
+      return (
+        <Button
+          label={t("repositoryRole.button.edit")}
+          link={`${url}/edit`}
+          color="primary"
+        />
+      );
+    }
+    return null;
+  }
+
   render() {
-    const { role, url } = this.props;
+    const { role } = this.props;
 
     return (
-
       <div>
-        <PermissionRoleDetailsTable role={role}/>
-        <hr/>
-        <Subtitle subtitle={"repositoryRoles.edit"}/>
-        <Button label={"test"} link={`${url}/edit`} color="primary" />
+        <PermissionRoleDetailsTable role={role} />
+        <hr />
+        {this.renderEditButton()}
         <div className="content">
           <ExtensionPoint
-            name="roles.repositoryRole-details.information"
+            name="repositoryRole.role-details.information"
             renderAll={true}
             props={{ role }}
           />
         </div>
       </div>
-
     );
   }
 }
diff --git a/scm-ui/src/config/roles/components/PermissionRoleTable.js b/scm-ui/src/config/roles/components/PermissionRoleTable.js
index 895883d8c4..a585a84bca 100644
--- a/scm-ui/src/config/roles/components/PermissionRoleTable.js
+++ b/scm-ui/src/config/roles/components/PermissionRoleTable.js
@@ -18,7 +18,7 @@ class PermissionRoleTable extends React.Component<Props> {
       <table className="card-table table is-hoverable is-fullwidth">
         <thead>
           <tr>
-            <th>{t("roles.form.name")}</th>
+            <th>{t("repositoryRole.form.name")}</th>
           </tr>
         </thead>
         <tbody>
diff --git a/scm-ui/src/config/roles/containers/CreateRepositoryRole.js b/scm-ui/src/config/roles/containers/CreateRepositoryRole.js
index 6592ff566a..e77df73deb 100644
--- a/scm-ui/src/config/roles/containers/CreateRepositoryRole.js
+++ b/scm-ui/src/config/roles/containers/CreateRepositoryRole.js
@@ -26,7 +26,7 @@ class CreateRepositoryRole extends React.Component<Props> {
 
   repositoryRoleCreated = (role: Role) => {
     const { history } = this.props;
-    history.push("/config/role/" + role.name);
+    history.push("/config/role/" + role.name + "/info");
   };
 
   createRepositoryRole = (role: Role) => {
diff --git a/scm-ui/src/config/roles/containers/EditRepositoryRole.js b/scm-ui/src/config/roles/containers/EditRepositoryRole.js
index f16db79dda..98599863fc 100644
--- a/scm-ui/src/config/roles/containers/EditRepositoryRole.js
+++ b/scm-ui/src/config/roles/containers/EditRepositoryRole.js
@@ -25,7 +25,7 @@ class EditRepositoryRole extends React.Component<Props> {
 
   repositoryRoleUpdated = (role: Role) => {
     const { history } = this.props;
-    history.push("/config/role/" + role.name);
+    history.push("/config/roles");
   };
 
   updateRepositoryRole = (role: Role) => {
@@ -38,13 +38,13 @@ class EditRepositoryRole extends React.Component<Props> {
     return (
       <>
         <RepositoryRoleForm
-          disabled={false}
+          nameDisabled={true}
           role={this.props.role}
           submitForm={role => this.updateRepositoryRole(role)}
         />
       </>
     );
-  }
+  }w
 }
 
 const mapStateToProps = (state, ownProps) => {
diff --git a/scm-ui/src/config/roles/containers/RepositoryRoleForm.js b/scm-ui/src/config/roles/containers/RepositoryRoleForm.js
index 852e097e4a..3515cddcfb 100644
--- a/scm-ui/src/config/roles/containers/RepositoryRoleForm.js
+++ b/scm-ui/src/config/roles/containers/RepositoryRoleForm.js
@@ -16,7 +16,7 @@ import {getRepositoryRolesLink, getRepositoryVerbsLink} from "../../../modules/i
 type Props = {
   role?: Role,
   loading?: boolean,
-  disabled: boolean,
+  nameDisabled: boolean,
   availableVerbs: string[],
   verbsLink: string,
   submitForm: Role => void,
@@ -63,7 +63,7 @@ class RepositoryRoleForm extends React.Component<Props, State> {
     return !(
       this.isFalsy(role) ||
       this.isFalsy(role.name) ||
-      this.isFalsy(role.verbs)
+      this.isFalsy(role.verbs.length > 0)
     );
   };
 
@@ -100,7 +100,7 @@ class RepositoryRoleForm extends React.Component<Props, State> {
   };
 
   render() {
-    const { loading, availableVerbs, disabled, t } = this.props;
+    const { loading, availableVerbs, nameDisabled, t } = this.props;
     const { role } = this.state;
 
     const verbSelectBoxes = !availableVerbs
@@ -120,10 +120,10 @@ class RepositoryRoleForm extends React.Component<Props, State> {
           <div className="column">
             <InputField
               name="name"
-              label={t("roles.create.name")}
+              label={t("repositoryRole.create.name")}
               onChange={this.handleNameChange}
               value={role.name ? role.name : ""}
-              disabled={disabled}
+              disabled={nameDisabled}
             />
           </div>
         </div>
@@ -133,8 +133,8 @@ class RepositoryRoleForm extends React.Component<Props, State> {
           <div className="column">
             <SubmitButton
               loading={loading}
-              label={t("roles.create.submit")}
-              disabled={disabled || !this.isValid()}
+              label={t("repositoryRole.form.submit")}
+              disabled={!this.isValid()}
             />
           </div>
         </div>
diff --git a/scm-ui/src/config/roles/containers/RepositoryRoles.js b/scm-ui/src/config/roles/containers/RepositoryRoles.js
index 5a613e1fcd..35f2888e89 100644
--- a/scm-ui/src/config/roles/containers/RepositoryRoles.js
+++ b/scm-ui/src/config/roles/containers/RepositoryRoles.js
@@ -56,7 +56,7 @@ class RepositoryRoles extends React.Component<Props> {
 
     return (
       <div>
-        <Title title={t("roles.title")} />
+        <Title title={t("repositoryRole.title")} />
         {this.renderPermissionsTable()}
         {this.renderCreateButton()}
       </div>
@@ -69,19 +69,19 @@ class RepositoryRoles extends React.Component<Props> {
       return (
         <>
           <PermissionRoleTable baseUrl={baseUrl} roles={roles} />
-          <LinkPaginator collection={list} page={page} />
+          <LinkPaginator collection={list} page={page}  />
         </>
       );
     }
     return (
-      <Notification type="info">{t("roles.noPermissionRoles")}</Notification>
+      <Notification type="info">{t("repositoryRole.noPermissionRoles")}</Notification>
     );
   }
 
   renderCreateButton() {
     const { canAddRoles, baseUrl, t } = this.props;
     if (canAddRoles) {
-      return <CreateButton label={t("roles.createButton")} link={`${baseUrl}/create`} />;
+      return <CreateButton label={t("repositoryRole.createButton")} link={`${baseUrl}/create`} />;
     }
     return null;
   }
diff --git a/scm-ui/src/config/roles/containers/SingleRepositoryRole.js b/scm-ui/src/config/roles/containers/SingleRepositoryRole.js
index 6b4f48819a..247021c855 100644
--- a/scm-ui/src/config/roles/containers/SingleRepositoryRole.js
+++ b/scm-ui/src/config/roles/containers/SingleRepositoryRole.js
@@ -4,7 +4,6 @@ import { connect } from "react-redux";
 import { Loading, ErrorPage, Title } from "@scm-manager/ui-components";
 import { Route } from "react-router";
 import type { History } from "history";
-import { EditRepositoryRoleNavLink } from "../../components/navLinks";
 import { translate } from "react-i18next";
 import type { Role } from "@scm-manager/ui-types";
 import { getRepositoryRolesLink } from "../../../modules/indexResource";
@@ -18,7 +17,6 @@ import {
 import { withRouter } from "react-router-dom";
 import PermissionRoleDetail from "../components/PermissionRoleDetails";
 import EditRepositoryRole from "./EditRepositoryRole";
-import Switch from "react-router-dom/es/Switch";
 
 type Props = {
   roleName: string,
@@ -43,7 +41,6 @@ class SingleRepositoryRole extends React.Component<Props> {
       this.props.repositoryRolesLink,
       this.props.roleName
     );
-    console.log(this.props.match);
   }
 
   stripEndingSlash = (url: string) => {
@@ -67,7 +64,7 @@ class SingleRepositoryRole extends React.Component<Props> {
           subtitle={t("singleUser.errorSubtitle")}
           error={error}
         />
-      );
+      );0
     }
 
     if (!role || loading) {
@@ -83,23 +80,25 @@ class SingleRepositoryRole extends React.Component<Props> {
 
     return (
       <>
-        <Title title={t("repositoryRoles.title")} />
+        <Title title={t("repositoryRole.title")} />
         <div className="columns">
           <div className="column is-three-quarters">
-              <Route
-                path={url}
-                component={() => <PermissionRoleDetail role={role} url={url} />}
-              />
-              <Route
-                path={`${url}`}
-                exact
-                component={() => <EditRepositoryRole role={role} />}
-              />
-              <ExtensionPoint
-                name="roles.route"
-                props={extensionProps}
-                renderAll={true}
-              />
+                <Route
+                  path={`${url}/info`}
+                  component={() => (
+                    <PermissionRoleDetail role={role} url={url} />
+                  )}
+                />
+                <Route
+                  path={`${url}/edit`}
+                  exact
+                  component={() => <EditRepositoryRole role={role} history={this.props.history} />}
+                />
+                <ExtensionPoint
+                  name="roles.route"
+                  props={extensionProps}
+                  renderAll={true}
+                />
           </div>
         </div>
       </>