diff --git a/scm-ui/public/locales/en/commons.json b/scm-ui/public/locales/en/commons.json
index f436658763..cfa2032bdd 100644
--- a/scm-ui/public/locales/en/commons.json
+++ b/scm-ui/public/locales/en/commons.json
@@ -29,6 +29,7 @@
     "alt": "SCM-Manager"
   },
   "primary-navigation": {
+    "repositories": "Repositories",
     "users": "Users",
     "logout": "Logout"
   }
diff --git a/scm-ui/public/locales/en/repositories.json b/scm-ui/public/locales/en/repositories.json
new file mode 100644
index 0000000000..4bb2370030
--- /dev/null
+++ b/scm-ui/public/locales/en/repositories.json
@@ -0,0 +1,6 @@
+{
+  "repositories": {
+    "title": "Repositories",
+    "subtitle": "Repositories will be shown here"
+  }
+}
diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json
new file mode 100644
index 0000000000..7f8e026fb9
--- /dev/null
+++ b/scm-ui/public/locales/en/users.json
@@ -0,0 +1,30 @@
+{
+  "user": {
+    "name": "Username",
+    "displayName": "Display Name",
+    "mail": "E-Mail",
+    "password": "Password",
+    "admin": "Admin",
+    "active": "Active"
+  },
+  "users": {
+    "title": "Users",
+    "subtitle": "Create, read, update and delete users",
+    "add-button": "Add User"
+  },
+  "delete-user-button": {
+    "label": "Delete",
+    "confirm-alert": {
+      "title": "Delete user",
+      "message": "Do you really want to delete the user?",
+      "submit": "Yes",
+      "cancel": "No"
+    }
+  },
+  "edit-user-button": {
+    "label": "Edit"
+  },
+  "user-form": {
+    "submit": "Submit"
+  }
+}
diff --git a/scm-ui/src/components/PrimaryNavigation.js b/scm-ui/src/components/PrimaryNavigation.js
index 83be320395..bb853c9808 100644
--- a/scm-ui/src/components/PrimaryNavigation.js
+++ b/scm-ui/src/components/PrimaryNavigation.js
@@ -13,6 +13,11 @@ class PrimaryNavigation extends React.Component<Props> {
     return (
       <nav className="tabs is-boxed">
         <ul>
+          <PrimaryNavigationLink
+            to="/"
+            activeOnlyWhenExact={true}
+            label={t("primary-navigation.repositories")}
+          />
           <PrimaryNavigationLink
             to="/users"
             label={t("primary-navigation.users")}
diff --git a/scm-ui/src/containers/App.js b/scm-ui/src/containers/App.js
index 47b8b27fb3..95a4970def 100644
--- a/scm-ui/src/containers/App.js
+++ b/scm-ui/src/containers/App.js
@@ -70,7 +70,7 @@ const mapStateToProps = state => {
     mapped.authenticated = state.auth.login.authenticated;
   }
   if (state.auth.me && state.auth.me.entry) {
-    displayName = state.auth.me.entry.entity.displayName;
+    displayName = state.auth.me.entry.displayName;
   }
   return {
     ...mapped,
diff --git a/scm-ui/src/repositories/containers/Repositories.js b/scm-ui/src/repositories/containers/Repositories.js
index be87b4c85d..c1d0d5e6fd 100644
--- a/scm-ui/src/repositories/containers/Repositories.js
+++ b/scm-ui/src/repositories/containers/Repositories.js
@@ -1,27 +1,22 @@
 // @flow
-import React from 'react';
-
-import { Link } from 'react-router-dom';
-
+import React from "react";
+import Page from "../../components/Page";
+import { translate } from "react-i18next";
 
 type Props = {
-}
+  t: string => string
+};
 
 class Repositories extends React.Component<Props> {
-
   render() {
-
-   return (
-        <div>
-          <h1>SCM</h1>
-          <h2>Repositories will be shown here.</h2>
-          <Link to='/users'>Users hier!</Link>
-        </div>
-      )
-
-
+    const { t } = this.props;
+    return (
+      <Page
+        title={t("repositories.title")}
+        subtitle={t("repositories.subtitle")}
+      />
+    );
   }
-
 }
 
-export default (Repositories);
+export default translate("repositories")(Repositories);
diff --git a/scm-ui/src/tests/i18n.js b/scm-ui/src/tests/i18n.js
new file mode 100644
index 0000000000..4f0dcc8f77
--- /dev/null
+++ b/scm-ui/src/tests/i18n.js
@@ -0,0 +1,7 @@
+jest.mock("react-i18next", () => ({
+  // this mock makes sure any components using the translate HoC receive the t function as a prop
+  translate: () => Component => {
+    Component.defaultProps = { ...Component.defaultProps, t: key => key };
+    return Component;
+  }
+}));
diff --git a/scm-ui/src/users/containers/DeleteUserButton.js b/scm-ui/src/users/containers/DeleteUserButton.js
index 19576996f3..31190505a5 100644
--- a/scm-ui/src/users/containers/DeleteUserButton.js
+++ b/scm-ui/src/users/containers/DeleteUserButton.js
@@ -1,5 +1,6 @@
 // @flow
 import React from "react";
+import { translate } from "react-i18next";
 import type { User } from "../types/User";
 import type { UserEntry } from "../types/UserEntry";
 import { confirmAlert } from "../../components/ConfirmAlert";
@@ -8,6 +9,7 @@ import DeleteButton from "../../components/DeleteButton";
 type Props = {
   entry: UserEntry,
   confirmDialog?: boolean,
+  t: string => string,
   deleteUser: (user: User) => void
 };
 
@@ -21,16 +23,17 @@ class DeleteUserButton extends React.Component<Props> {
   };
 
   confirmDelete = () => {
+    const { t } = this.props;
     confirmAlert({
-      title: "Delete user",
-      message: "Do you really want to delete the user?",
+      title: t("delete-user-button.confirm-alert.title"),
+      message: t("delete-user-button.confirm-alert.message"),
       buttons: [
         {
-          label: "Yes",
+          label: t("delete-user-button.confirm-alert.submit"),
           onClick: () => this.deleteUser()
         },
         {
-          label: "No",
+          label: t("delete-user-button.confirm-alert.cancel"),
           onClick: () => null
         }
       ]
@@ -42,16 +45,20 @@ class DeleteUserButton extends React.Component<Props> {
   };
 
   render() {
-    const { confirmDialog, entry } = this.props;
+    const { confirmDialog, entry, t } = this.props;
     const action = confirmDialog ? this.confirmDelete : this.deleteUser;
 
     if (!this.isDeletable()) {
       return null;
     }
     return (
-      <DeleteButton label="Delete" action={action} loading={entry.loading} />
+      <DeleteButton
+        label={t("delete-user-button.label")}
+        action={action}
+        loading={entry.loading}
+      />
     );
   }
 }
 
-export default DeleteUserButton;
+export default translate("users")(DeleteUserButton);
diff --git a/scm-ui/src/users/containers/DeleteUserButton.test.js b/scm-ui/src/users/containers/DeleteUserButton.test.js
index fd0965c9ef..b44416056b 100644
--- a/scm-ui/src/users/containers/DeleteUserButton.test.js
+++ b/scm-ui/src/users/containers/DeleteUserButton.test.js
@@ -1,6 +1,7 @@
 import React from "react";
 import { mount, shallow } from "enzyme";
 import "../../tests/enzyme";
+import "../../tests/i18n";
 import DeleteUserButton from "./DeleteUserButton";
 
 import { confirmAlert } from "../../components/ConfirmAlert";
diff --git a/scm-ui/src/users/containers/EditUserButton.js b/scm-ui/src/users/containers/EditUserButton.js
index c7a0a736a0..6bafa73468 100644
--- a/scm-ui/src/users/containers/EditUserButton.js
+++ b/scm-ui/src/users/containers/EditUserButton.js
@@ -1,21 +1,29 @@
 //@flow
 import React from "react";
+import { translate } from "react-i18next";
 import EditButton from "../../components/EditButton";
 import type { UserEntry } from "../types/UserEntry";
 
 type Props = {
+  t: string => string,
   entry: UserEntry
 };
 
 class EditUserButton extends React.Component<Props> {
   render() {
-    const { entry } = this.props;
+    const { entry, t } = this.props;
     const link = "/users/edit/" + entry.entry.name;
 
     if (!this.isEditable()) {
       return "";
     }
-    return <EditButton label="Edit" link={link} loading={entry.loading} />;
+    return (
+      <EditButton
+        label={t("edit-user-button.label")}
+        link={link}
+        loading={entry.loading}
+      />
+    );
   }
 
   isEditable = () => {
@@ -23,4 +31,4 @@ class EditUserButton extends React.Component<Props> {
   };
 }
 
-export default EditUserButton;
+export default translate("users")(EditUserButton);
diff --git a/scm-ui/src/users/containers/EditUserButton.test.js b/scm-ui/src/users/containers/EditUserButton.test.js
index e02779143a..9c79e0ca33 100644
--- a/scm-ui/src/users/containers/EditUserButton.test.js
+++ b/scm-ui/src/users/containers/EditUserButton.test.js
@@ -1,6 +1,7 @@
 import React from "react";
 import { configure, shallow } from "enzyme";
 import "../../tests/enzyme";
+import "../../tests/i18n";
 import EditUserButton from "./EditUserButton";
 
 it("should render nothing, if the edit link is missing", () => {
diff --git a/scm-ui/src/users/containers/UserForm.js b/scm-ui/src/users/containers/UserForm.js
index 8389c98ad2..ffa6069f9b 100644
--- a/scm-ui/src/users/containers/UserForm.js
+++ b/scm-ui/src/users/containers/UserForm.js
@@ -1,14 +1,17 @@
 // @flow
 import React from "react";
+import { translate } from "react-i18next";
 import type { User } from "../types/User";
 import InputField from "../../components/InputField";
 import Checkbox from "../../components/Checkbox";
 import SubmitButton from "../../components/SubmitButton";
+import Loading from "../../components/Loading";
 
 type Props = {
   submitForm: User => void,
   user?: User,
-  loading?: boolean
+  loading?: boolean,
+  t: string => string
 };
 
 class UserForm extends React.Component<Props, User> {
@@ -34,48 +37,52 @@ class UserForm extends React.Component<Props, User> {
   };
 
   render() {
+    const { t } = this.props;
     const user = this.state;
     if (user) {
       return (
         <div className="container">
           <form onSubmit={this.submit}>
             <InputField
-              label="Username"
+              label={t("user.name")}
               onChange={this.handleUsernameChange}
               value={user ? user.name : ""}
             />
             <InputField
-              label="Display Name"
+              label={t("user.displayName")}
               onChange={this.handleDisplayNameChange}
               value={user ? user.displayName : ""}
             />
             <InputField
-              label="E-Mail"
+              label={t("user.mail")}
               onChange={this.handleEmailChange}
               value={user ? user.mail : ""}
             />
             <InputField
-              label="Password"
+              label={t("user.password")}
               type="password"
               onChange={this.handlePasswordChange}
               value={user ? user.password : ""}
             />
             <Checkbox
-              label="Admin"
+              label={t("user.admin")}
               onChange={this.handleAdminChange}
               checked={user ? user.admin : false}
             />
             <Checkbox
-              label="Active"
+              label={t("user.active")}
               onChange={this.handleActiveChange}
               checked={user ? user.active : false}
             />
-            <SubmitButton label="Submit" loading={this.props.loading} />
+            <SubmitButton
+              label={t("user-form.submit")}
+              loading={this.props.loading}
+            />
           </form>
         </div>
       );
     } else {
-      return <div>Loading...</div>;
+      return <Loading />;
     }
   }
 
@@ -104,4 +111,4 @@ class UserForm extends React.Component<Props, User> {
   };
 }
 
-export default UserForm;
+export default translate("users")(UserForm);
diff --git a/scm-ui/src/users/containers/UserTable.js b/scm-ui/src/users/containers/UserTable.js
index 19d0766cb2..7e321293e8 100644
--- a/scm-ui/src/users/containers/UserTable.js
+++ b/scm-ui/src/users/containers/UserTable.js
@@ -1,26 +1,28 @@
 // @flow
 import React from "react";
+import { translate } from "react-i18next";
 import UserRow from "./UserRow";
 import type { User } from "../types/User";
 import type { UserEntry } from "../types/UserEntry";
 
 type Props = {
+  t: string => string,
   entries: Array<UserEntry>,
   deleteUser: User => void
 };
 
 class UserTable extends React.Component<Props> {
   render() {
-    const { deleteUser } = this.props;
+    const { deleteUser, t } = this.props;
     const entries = this.props.entries;
     return (
       <table className="table is-hoverable is-fullwidth">
         <thead>
           <tr>
-            <th>Name</th>
-            <th>Display Name</th>
-            <th>E-Mail</th>
-            <th>Admin</th>
+            <th>{t("user.name")}</th>
+            <th>{t("user.displayName")}</th>
+            <th>{t("user.mail")}</th>
+            <th>{t("user.admin")}</th>
             <th />
             <th />
           </tr>
@@ -37,4 +39,4 @@ class UserTable extends React.Component<Props> {
   }
 }
 
-export default UserTable;
+export default translate("users")(UserTable);
diff --git a/scm-ui/src/users/containers/Users.js b/scm-ui/src/users/containers/Users.js
index 9b39cdf6f4..047369c407 100644
--- a/scm-ui/src/users/containers/Users.js
+++ b/scm-ui/src/users/containers/Users.js
@@ -1,6 +1,7 @@
 // @flow
 import React from "react";
 import { connect } from "react-redux";
+import { translate } from "react-i18next";
 
 import { fetchUsers, deleteUser, getUsersFromState } from "../modules/users";
 import Page from "../../components/Page";
@@ -12,6 +13,7 @@ import type { UserEntry } from "../types/UserEntry";
 type Props = {
   loading?: boolean,
   error: Error,
+  t: string => string,
   userEntries: Array<UserEntry>,
   fetchUsers: () => void,
   deleteUser: User => void,
@@ -24,11 +26,11 @@ class Users extends React.Component<Props, User> {
   }
 
   render() {
-    const { userEntries, deleteUser, loading, error } = this.props;
+    const { userEntries, deleteUser, loading, t, error } = this.props;
     return (
       <Page
-        title="Users"
-        subtitle="Create, read, update and delete users"
+        title={t("users.title")}
+        subtitle={t("users.subtitle")}
         loading={loading || !userEntries}
         error={error}
       >
@@ -39,10 +41,11 @@ class Users extends React.Component<Props, User> {
   }
 
   renderAddButton() {
-    if (this.props.canAddUsers) {
+    const { canAddUsers, t } = this.props;
+    if (canAddUsers) {
       return (
         <div>
-          <AddButton label="Add User" link="/users/add" />
+          <AddButton label={t("users.add-button")} link="/users/add" />
         </div>
       );
     } else {
@@ -83,4 +86,4 @@ const mapDispatchToProps = dispatch => {
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(Users);
+)(translate("users")(Users));
diff --git a/scm-ui/src/users/modules/users.js b/scm-ui/src/users/modules/users.js
index 1d6f186c14..64a89dfacb 100644
--- a/scm-ui/src/users/modules/users.js
+++ b/scm-ui/src/users/modules/users.js
@@ -25,7 +25,6 @@ export const DELETE_USER_SUCCESS = "scm/users/DELETE_SUCCESS";
 export const DELETE_USER_FAILURE = "scm/users/DELETE_FAILURE";
 
 const USERS_URL = "users";
-const USER_URL = "users/";
 
 const CONTENT_TYPE_USER = "application/vnd.scmm-user+json;v=2";
 
@@ -154,7 +153,6 @@ export function createUserPending(user: User) {
   };
 }
 
-
 export function createUserSuccess() {
   return {
     type: CREATE_USER_SUCCESS
@@ -181,7 +179,6 @@ export function modifyUser(user: User) {
         dispatch(fetchUsers());
       })
       .catch(err => {
-        console.log(err);
         dispatch(modifyUserFailure(user, err));
       });
   };