diff --git a/scm-ui-components/packages/ui-components/src/OverviewPageActions.js b/scm-ui-components/packages/ui-components/src/OverviewPageActions.js
index f4861fccc0..96c0be72f8 100644
--- a/scm-ui-components/packages/ui-components/src/OverviewPageActions.js
+++ b/scm-ui-components/packages/ui-components/src/OverviewPageActions.js
@@ -30,12 +30,13 @@ const styles = {
 class OverviewPageActions extends React.Component<Props> {
   render() {
     const { history, location, link } = this.props;
+    let directory = link.substring(0, link.indexOf("/"));
     return (
       <PageActions>
         <FilterInput
           value={urls.getQueryStringFromLocation(location)}
           filter={filter => {
-            history.push(`/${link}/?q=${filter}`);
+            history.push(`/${directory}/?q=${filter}`);
           }}
         />
         {this.renderCreateButton()}
@@ -48,11 +49,7 @@ class OverviewPageActions extends React.Component<Props> {
     if (showCreateButton) {
       return (
         <div className={classNames(classes.button, "input-button control")}>
-          <Button
-            label={label} //t("overview.createButton")
-            link={`/${link}/create`}
-            color="primary"
-          />
+          <Button label={label} link={`/${link}`} color="primary" />
         </div>
       );
     }
diff --git a/scm-ui/src/users/components/buttons/CreateUserButton.js b/scm-ui/src/users/components/buttons/CreateUserButton.js
new file mode 100644
index 0000000000..36ab9c137d
--- /dev/null
+++ b/scm-ui/src/users/components/buttons/CreateUserButton.js
@@ -0,0 +1,19 @@
+//@flow
+import React from "react";
+import { translate } from "react-i18next";
+import { CreateButton } from "@scm-manager/ui-components";
+
+type Props = {
+  t: string => string
+};
+
+class CreateUserButton extends React.Component<Props> {
+  render() {
+    const { t } = this.props;
+    return (
+      <CreateButton label={t("users.createButton")} link="/users/add" />
+    );
+  }
+}
+
+export default translate("users")(CreateUserButton);