diff --git a/scm-ui/.vscode/launch.json b/scm-ui/.vscode/launch.json
new file mode 100644
index 0000000000..489c044be5
--- /dev/null
+++ b/scm-ui/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:3000",
+            "webRoot": "${workspaceFolder}/src"
+        }
+    ]
+}
diff --git a/scm-ui/README.md b/scm-ui/README.md
index af0586949e..3527f84d73 100644
--- a/scm-ui/README.md
+++ b/scm-ui/README.md
@@ -6,10 +6,14 @@
 * Flow Language Support
 * Prettier - Code formatter
 * Project Snippets
+* Debugger for Chrome
 
 ```bash
 code --install-extension EditorConfig.EditorConfig
 code --install-extension flowtype.flow-for-vscode
 code --install-extension esbenp.prettier-vscode
 code --install-extension rebornix.project-snippets
+
+# debugging with chrome browser
+code --install-extension msjsdiag.debugger-for-chrome
 ```
diff --git a/scm-ui/src/apiclient.js b/scm-ui/src/apiclient.js
index 7326e78820..bcddf040aa 100644
--- a/scm-ui/src/apiclient.js
+++ b/scm-ui/src/apiclient.js
@@ -3,8 +3,8 @@
 // get api base url from environment
 const apiUrl = process.env.API_URL || process.env.PUBLIC_URL || "/scm";
 
-export const PAGE_NOT_FOUND_ERROR = Error("page not found");
-export const NOT_AUTHENTICATED_ERROR = Error("not authenticated");
+export const NOT_FOUND_ERROR = Error("not found");
+export const UNAUTHORIZED_ERROR = Error("unauthorized");
 
 const fetchOptions: RequestOptions = {
   credentials: "same-origin",
@@ -16,10 +16,10 @@ const fetchOptions: RequestOptions = {
 function handleStatusCode(response: Response) {
   if (!response.ok) {
     if (response.status === 401) {
-      throw NOT_AUTHENTICATED_ERROR;
+      throw UNAUTHORIZED_ERROR;
     }
     if (response.status === 404) {
-      throw PAGE_NOT_FOUND_ERROR;
+      throw NOT_FOUND_ERROR;
     }
     throw new Error("server returned status code " + response.status);
   }
diff --git a/scm-ui/src/components/ErrorNotification.js b/scm-ui/src/components/ErrorNotification.js
index a10ceea6a3..d90caf22a2 100644
--- a/scm-ui/src/components/ErrorNotification.js
+++ b/scm-ui/src/components/ErrorNotification.js
@@ -3,7 +3,7 @@ import React from "react";
 import Notification from "./Notification";
 
 type Props = {
-  error: Error
+  error?: Error
 };
 
 class ErrorNotification extends React.Component<Props> {
diff --git a/scm-ui/src/components/Footer.js b/scm-ui/src/components/Footer.js
index 6673b77949..fd17c06d8b 100644
--- a/scm-ui/src/components/Footer.js
+++ b/scm-ui/src/components/Footer.js
@@ -3,15 +3,19 @@ import React from "react";
 import type { Me } from "../types/me";
 
 type Props = {
-  me: Me
+  me?: Me
 };
 
 class Footer extends React.Component<Props> {
   render() {
+    const { me } = this.props;
+    if (!me) {
+      return "";
+    }
     return (
       <footer className="footer">
         <div className="container is-centered">
-          <p className="has-text-centered">{this.props.me.username}</p>
+          <p className="has-text-centered">{me.username}</p>
         </div>
       </footer>
     );
diff --git a/scm-ui/src/components/PrimaryNavigation.js b/scm-ui/src/components/PrimaryNavigation.js
index a66d796a4d..3eda2a2937 100644
--- a/scm-ui/src/components/PrimaryNavigation.js
+++ b/scm-ui/src/components/PrimaryNavigation.js
@@ -1,11 +1,8 @@
 //@flow
 import React from "react";
 import PrimaryNavigationLink from "./PrimaryNavigationLink";
-import PrimaryNavigationAction from "./PrimaryNavigationAction";
 
-type Props = {
-  onLogout: () => void
-};
+type Props = {};
 
 class PrimaryNavigation extends React.Component<Props> {
   render() {
@@ -13,10 +10,7 @@ class PrimaryNavigation extends React.Component<Props> {
       <nav className="tabs is-boxed">
         <ul>
           <PrimaryNavigationLink to="/users" label="Users" />
-          <PrimaryNavigationAction
-            onClick={this.props.onLogout}
-            label="Logout"
-          />
+          <PrimaryNavigationLink to="/logout" label="Logout" />
         </ul>
       </nav>
     );
diff --git a/scm-ui/src/components/PrimaryNavigationAction.js b/scm-ui/src/components/PrimaryNavigationAction.js
deleted file mode 100644
index bf5b91ad2b..0000000000
--- a/scm-ui/src/components/PrimaryNavigationAction.js
+++ /dev/null
@@ -1,20 +0,0 @@
-//@flow
-import * as React from "react";
-
-type Props = {
-  label: string,
-  onClick: () => void
-};
-
-class PrimaryNavigationAction extends React.Component<Props> {
-  render() {
-    const { label, onClick } = this.props;
-    return (
-      <li>
-        <a onClick={onClick}>{label}</a>
-      </li>
-    );
-  }
-}
-
-export default PrimaryNavigationAction;
diff --git a/scm-ui/src/components/ProtectedRoute.js b/scm-ui/src/components/ProtectedRoute.js
new file mode 100644
index 0000000000..a71f23edf6
--- /dev/null
+++ b/scm-ui/src/components/ProtectedRoute.js
@@ -0,0 +1,39 @@
+//@flow
+import React, { Component } from "react";
+import { Route, Redirect, withRouter } from "react-router-dom";
+
+type Props = {
+  authenticated?: boolean,
+  component: Component<any, any>
+};
+
+class ProtectedRoute extends React.Component<Props> {
+  renderRoute = (Component: any, authenticated?: boolean) => {
+    return (routeProps: any) => {
+      if (authenticated) {
+        return <Component {...routeProps} />;
+      } else {
+        return (
+          <Redirect
+            to={{
+              pathname: "/login",
+              state: { from: routeProps.location }
+            }}
+          />
+        );
+      }
+    };
+  };
+
+  render() {
+    const { component, authenticated, ...routeProps } = this.props;
+    return (
+      <Route
+        {...routeProps}
+        render={this.renderRoute(component, authenticated)}
+      />
+    );
+  }
+}
+
+export default withRouter(ProtectedRoute);
diff --git a/scm-ui/src/components/SubmitButton.js b/scm-ui/src/components/SubmitButton.js
index d4ebdf476c..e022d74155 100644
--- a/scm-ui/src/components/SubmitButton.js
+++ b/scm-ui/src/components/SubmitButton.js
@@ -22,7 +22,6 @@ class SubmitButton extends React.Component<Props> {
       <div className="field">
         <div className="control">
           <button
-            type="submit"
             disabled={disabled}
             className={classNames(
               "button",
diff --git a/scm-ui/src/containers/App.js b/scm-ui/src/containers/App.js
index fbde1036fd..4ff9b245f7 100644
--- a/scm-ui/src/containers/App.js
+++ b/scm-ui/src/containers/App.js
@@ -1,26 +1,23 @@
 import React, { Component } from "react";
-import type { ThunkDispatch } from "redux-thunk";
 import Main from "./Main";
-import Login from "./Login";
 import { connect } from "react-redux";
 import { withRouter } from "react-router-dom";
-import { fetchMe } from "../modules/me";
-import { logout } from "../modules/auth";
+import { fetchMe } from "../modules/auth";
 
 import "./App.css";
 import "../components/ConfirmAlert.css";
 import Header from "../components/Header";
 import PrimaryNavigation from "../components/PrimaryNavigation";
 import Loading from "../components/Loading";
-import ErrorNotification from "../components/ErrorNotification";
 import ErrorPage from "../components/ErrorPage";
+import Footer from "../components/Footer";
 
 type Props = {
   me: any,
   error: Error,
   loading: boolean,
-  fetchMe: () => void,
-  logout: () => void
+  authenticated?: boolean,
+  fetchMe: () => void
 };
 
 class App extends Component<Props> {
@@ -28,20 +25,15 @@ class App extends Component<Props> {
     this.props.fetchMe();
   }
 
-  logout = () => {
-    this.props.logout();
-  };
-
   render() {
-    const { me, loading, error } = this.props;
+    const { entry, loading, error, authenticated } = this.props;
 
     let content;
-    let navigation;
+    const navigation = authenticated ? <PrimaryNavigation /> : "";
 
     if (loading) {
       content = <Loading />;
     } else if (error) {
-      // TODO add error page instead of plain notification
       content = (
         <ErrorPage
           title="Error"
@@ -49,31 +41,31 @@ class App extends Component<Props> {
           error={error}
         />
       );
-    } else if (!me) {
-      content = <Login />;
     } else {
-      content = <Main me={me} />;
-      navigation = <PrimaryNavigation onLogout={this.logout} />;
+      content = <Main authenticated={authenticated} />;
     }
-
     return (
       <div className="App">
         <Header>{navigation}</Header>
         {content}
+        <Footer me={entry} />
       </div>
     );
   }
 }
 
-const mapDispatchToProps = (dispatch: ThunkDispatch) => {
+const mapDispatchToProps = (dispatch: any) => {
   return {
-    fetchMe: () => dispatch(fetchMe()),
-    logout: () => dispatch(logout())
+    fetchMe: () => dispatch(fetchMe())
   };
 };
 
 const mapStateToProps = state => {
-  return state.me || {};
+  let mapped = state.auth.me || {};
+  if (state.auth.login) {
+    mapped.authenticated = state.auth.login.authenticated;
+  }
+  return mapped;
 };
 
 export default withRouter(
diff --git a/scm-ui/src/containers/Login.js b/scm-ui/src/containers/Login.js
index fac8332275..3c69eff123 100644
--- a/scm-ui/src/containers/Login.js
+++ b/scm-ui/src/containers/Login.js
@@ -1,5 +1,6 @@
 //@flow
 import React from "react";
+import { Redirect, withRouter } from "react-router-dom";
 import injectSheet from "react-jss";
 import { login } from "../modules/auth";
 import { connect } from "react-redux";
@@ -30,9 +31,15 @@ const styles = {
 };
 
 type Props = {
-  loading: boolean,
-  error: Error,
+  authenticated?: boolean,
+  loading?: boolean,
+  error?: Error,
+
   classes: any,
+
+  from: any,
+  location: any,
+
   login: (username: string, password: string) => void
 };
 
@@ -70,8 +77,17 @@ class Login extends React.Component<Props, State> {
     return !this.isValid();
   }
 
+  renderRedirect = () => {
+    const { from } = this.props.location.state || { from: { pathname: "/" } };
+    return <Redirect to={from} />;
+  };
+
   render() {
-    const { classes, loading, error } = this.props;
+    const { authenticated, loading, error, classes } = this.props;
+
+    if (authenticated) {
+      return this.renderRedirect();
+    }
 
     return (
       <section className="hero has-background-light">
@@ -117,7 +133,7 @@ class Login extends React.Component<Props, State> {
 }
 
 const mapStateToProps = state => {
-  return state.login || {};
+  return state.auth.login || {};
 };
 
 const mapDispatchToProps = dispatch => {
@@ -133,4 +149,4 @@ const StyledLogin = injectSheet(styles)(
     mapDispatchToProps
   )(Login)
 );
-export default StyledLogin;
+export default withRouter(StyledLogin);
diff --git a/scm-ui/src/containers/Logout.js b/scm-ui/src/containers/Logout.js
new file mode 100644
index 0000000000..30b30ce580
--- /dev/null
+++ b/scm-ui/src/containers/Logout.js
@@ -0,0 +1,56 @@
+//@flow
+import React from "react";
+import { connect } from "react-redux";
+import { Redirect } from "react-router-dom";
+
+import { logout, isAuthenticated } from "../modules/auth";
+import ErrorPage from "../components/ErrorPage";
+import Loading from "../components/Loading";
+
+type Props = {
+  loading: boolean,
+  authenticated: boolean,
+  error?: Error,
+  logout: () => void
+};
+
+class Logout extends React.Component<Props> {
+  componentDidMount() {
+    this.props.logout();
+  }
+
+  render() {
+    const { authenticated, loading, error } = this.props;
+    // TODO logout is called twice
+    if (error) {
+      return (
+        <ErrorPage
+          title="Logout failed"
+          subtitle="Something went wrong durring logout"
+          error={error}
+        />
+      );
+    } else if (loading || authenticated) {
+      return <Loading />;
+    } else {
+      return <Redirect to="/login" />;
+    }
+  }
+}
+
+const mapStateToProps = state => {
+  let mapped = state.auth.logout || {};
+  mapped.authenticated = isAuthenticated(state);
+  return mapped;
+};
+
+const mapDispatchToProps = dispatch => {
+  return {
+    logout: () => dispatch(logout())
+  };
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(Logout);
diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js
index c28a1785a0..021110a075 100644
--- a/scm-ui/src/containers/Main.js
+++ b/scm-ui/src/containers/Main.js
@@ -5,26 +5,36 @@ import { Route, withRouter } from "react-router";
 
 import Repositories from "../repositories/containers/Repositories";
 import Users from "../users/containers/Users";
+import Login from "../containers/Login";
+import Logout from "../containers/Logout";
 
 import { Switch } from "react-router-dom";
-import Footer from "../components/Footer";
-
-import type { Me } from "../types/me";
+import ProtectedRoute from "../components/ProtectedRoute";
 
 type Props = {
-  me: Me
+  authenticated?: boolean
 };
 
 class Main extends React.Component<Props> {
   render() {
-    const { me } = this.props;
+    const { authenticated } = this.props;
     return (
       <div>
         <Switch>
-          <Route exact path="/" component={Repositories} />
-          <Route path="/users" component={Users} />
+          <ProtectedRoute
+            exact
+            path="/"
+            component={Repositories}
+            authenticated={authenticated}
+          />
+          <Route exact path="/login" component={Login} />
+          <Route path="/logout" component={Logout} />
+          <ProtectedRoute
+            path="/users"
+            component={Users}
+            authenticated={authenticated}
+          />
         </Switch>
-        <Footer me={me} />
       </div>
     );
   }
diff --git a/scm-ui/src/createReduxStore.js b/scm-ui/src/createReduxStore.js
index fd6a01d00a..bedddc908e 100644
--- a/scm-ui/src/createReduxStore.js
+++ b/scm-ui/src/createReduxStore.js
@@ -7,7 +7,6 @@ import { routerReducer, routerMiddleware } from "react-router-redux";
 import repositories from "./repositories/modules/repositories";
 import users from "./users/modules/users";
 import auth from "./modules/auth";
-import me from "./modules/me";
 
 import type { BrowserHistory } from "history/createBrowserHistory";
 
@@ -19,8 +18,7 @@ function createReduxStore(history: BrowserHistory) {
     router: routerReducer,
     repositories,
     users,
-    auth,
-    me
+    auth
   });
 
   return createStore(
diff --git a/scm-ui/src/modules/auth.js b/scm-ui/src/modules/auth.js
index 6363881ec7..5540063ee5 100644
--- a/scm-ui/src/modules/auth.js
+++ b/scm-ui/src/modules/auth.js
@@ -1,139 +1,239 @@
-//@flow
+// @flow
+import type { Me } from "../types/me";
 
-import { apiClient } from "../apiclient";
-import { fetchMe } from "./me";
+import { apiClient, UNAUTHORIZED_ERROR } from "../apiclient";
 
+// Action
+
+export const LOGIN_REQUEST = "scm/auth/LOGIN_REQUEST";
+export const LOGIN_SUCCESS = "scm/auth/LOGIN_SUCCESS";
+export const LOGIN_FAILURE = "scm/auth/LOGIN_FAILURE";
+
+export const FETCH_ME_REQUEST = "scm/auth/FETCH_ME_REQUEST";
+export const FETCH_ME_SUCCESS = "scm/auth/FETCH_ME_SUCCESS";
+export const FETCH_ME_FAILURE = "scm/auth/FETCH_ME_FAILURE";
+export const FETCH_ME_UNAUTHORIZED = "scm/auth/FETCH_ME_UNAUTHORIZED";
+
+export const LOGOUT_REQUEST = "scm/auth/LOGOUT_REQUEST";
+export const LOGOUT_SUCCESS = "scm/auth/LOGOUT_SUCCESS";
+export const LOGOUT_FAILURE = "scm/auth/LOGOUT_FAILURE";
+
+// Reducer
+
+const initialState = {
+  me: { loading: true }
+};
+
+export default function reducer(state: any = initialState, action: any = {}) {
+  switch (action.type) {
+    case LOGIN_REQUEST:
+      return {
+        ...state,
+        login: {
+          loading: true
+        }
+      };
+    case LOGIN_SUCCESS:
+      return {
+        ...state,
+        login: {
+          authenticated: true
+        }
+      };
+    case LOGIN_FAILURE:
+      return {
+        ...state,
+        login: {
+          error: action.payload
+        }
+      };
+
+    case FETCH_ME_REQUEST:
+      return {
+        ...state,
+        me: {
+          loading: true
+        }
+      };
+    case FETCH_ME_SUCCESS:
+      return {
+        ...state,
+        me: {
+          entry: action.payload
+        },
+        login: {
+          authenticated: true
+        }
+      };
+    case FETCH_ME_UNAUTHORIZED:
+      return {
+        ...state,
+        me: {},
+        login: {
+          authenticated: false
+        }
+      };
+    case FETCH_ME_FAILURE:
+      return {
+        ...state,
+        me: {
+          error: action.payload
+        }
+      };
+
+    case LOGOUT_REQUEST:
+      return {
+        ...state,
+        logout: {
+          loading: true
+        }
+      };
+    case LOGOUT_SUCCESS:
+      return initialState;
+    case LOGOUT_FAILURE:
+      return {
+        ...state,
+        logout: {
+          error: action.payload
+        }
+      };
+    default:
+      return state;
+  }
+}
+
+// Action Creators
+
+export const loginRequest = () => {
+  return {
+    type: LOGIN_REQUEST
+  };
+};
+
+export const loginSuccess = () => {
+  return {
+    type: LOGIN_SUCCESS
+  };
+};
+
+export const loginFailure = (error: Error) => {
+  return {
+    type: LOGIN_FAILURE,
+    payload: error
+  };
+};
+
+export const logoutRequest = () => {
+  return {
+    type: LOGOUT_REQUEST
+  };
+};
+
+export const logoutSuccess = () => {
+  return {
+    type: LOGOUT_SUCCESS
+  };
+};
+
+export const logoutFailure = (error: Error) => {
+  return {
+    type: LOGOUT_FAILURE,
+    payload: error
+  };
+};
+
+export const fetchMeRequest = () => {
+  return {
+    type: FETCH_ME_REQUEST
+  };
+};
+
+export const fetchMeSuccess = (me: Me) => {
+  return {
+    type: FETCH_ME_SUCCESS,
+    payload: me
+  };
+};
+
+export const fetchMeUnauthenticated = () => {
+  return {
+    type: FETCH_ME_UNAUTHORIZED
+  };
+};
+
+export const fetchMeFailure = (error: Error) => {
+  return {
+    type: FETCH_ME_FAILURE,
+    payload: error
+  };
+};
+
+// urls
+
+const ME_URL = "/me";
 const LOGIN_URL = "/auth/access_token";
 
-export const LOGIN_REQUEST = "scm/auth/login_request";
-export const LOGIN_SUCCESSFUL = "scm/auth/login_successful";
-export const LOGIN_FAILED = "scm/auth/login_failed";
+// side effects
 
-export const LOGOUT_REQUEST = "scm/auth/logout_request";
-export const LOGOUT_SUCCESSFUL = "scm/auth/logout_successful";
-export const LOGOUT_FAILED = "scm/auth/logout_failed";
-
-export function login(username: string, password: string) {
+export const login = (username: string, password: string) => {
   const login_data = {
     cookie: true,
     grant_type: "password",
     username,
     password
   };
-  return function(dispatch: any => void) {
+  return function(dispatch: any) {
     dispatch(loginRequest());
     return apiClient
       .post(LOGIN_URL, login_data)
       .then(response => {
-        // not the best way or?
         dispatch(fetchMe());
-        dispatch(loginSuccessful());
+        dispatch(loginSuccess());
       })
       .catch(err => {
-        dispatch(loginFailed(err));
+        dispatch(loginFailure(err));
       });
   };
-}
+};
 
-export function loginRequest() {
-  return {
-    type: LOGIN_REQUEST
+export const fetchMe = () => {
+  return function(dispatch: any) {
+    dispatch(fetchMeRequest());
+    return apiClient
+      .get(ME_URL)
+      .then(response => {
+        return response.json();
+      })
+      .then(me => {
+        dispatch(fetchMeSuccess(me));
+      })
+      .catch((error: Error) => {
+        if (error === UNAUTHORIZED_ERROR) {
+          dispatch(fetchMeUnauthenticated());
+        } else {
+          dispatch(fetchMeFailure(error));
+        }
+      });
   };
-}
+};
 
-export function loginSuccessful() {
-  return {
-    type: LOGIN_SUCCESSFUL
-  };
-}
-
-export function loginFailed(error: Error) {
-  return {
-    type: LOGIN_FAILED,
-    payload: error
-  };
-}
-
-export function logout() {
+export const logout = () => {
   return function(dispatch: any) {
     dispatch(logoutRequest());
     return apiClient
       .delete(LOGIN_URL)
       .then(() => {
         dispatch(logoutSuccess());
-        // not the best way or?
         dispatch(fetchMe());
       })
       .catch(error => {
-        dispatch(logoutFailed(error));
+        dispatch(logoutFailure(error));
       });
   };
-}
+};
 
-export function logoutRequest() {
-  return {
-    type: LOGOUT_REQUEST
-  };
-}
+// selectors
 
-export function logoutSuccess() {
-  return {
-    type: LOGOUT_SUCCESSFUL
-  };
-}
-
-export function logoutFailed(error: Error) {
-  return {
-    type: LOGOUT_FAILED,
-    payload: error
-  };
-}
-
-export default function reducer(state: any = {}, action: any = {}) {
-  switch (action.type) {
-    case LOGIN_REQUEST:
-      return {
-        ...state,
-        loading: true,
-        login: false,
-        error: null
-      };
-    case LOGIN_SUCCESSFUL:
-      return {
-        ...state,
-        loading: false,
-        login: true,
-        error: null
-      };
-    case LOGIN_FAILED:
-      return {
-        ...state,
-        loading: false,
-        login: false,
-        error: action.payload
-      };
-
-    case LOGOUT_REQUEST:
-      return {
-        ...state,
-        loading: true,
-        error: null
-      };
-    case LOGOUT_SUCCESSFUL:
-      return {
-        ...state,
-        loading: false,
-        login: false,
-        error: null
-      };
-    case LOGOUT_FAILED:
-      return {
-        ...state,
-        loading: false,
-        error: action.payload
-      };
-
-    default:
-      return state;
-  }
-}
+export const isAuthenticated = (state: any): boolean => {
+  return state.auth && state.auth.login && state.auth.login.authenticated;
+};
diff --git a/scm-ui/src/modules/auth.test.js b/scm-ui/src/modules/auth.test.js
index c9b09f38ba..689a74c047 100644
--- a/scm-ui/src/modules/auth.test.js
+++ b/scm-ui/src/modules/auth.test.js
@@ -1,22 +1,115 @@
-// @flow
 import reducer, {
-  login,
+  fetchMeSuccess,
   logout,
+  logoutSuccess,
+  loginSuccess,
+  fetchMeRequest,
+  loginRequest,
+  logoutRequest,
+  fetchMeFailure,
+  fetchMeUnauthenticated,
+  loginFailure,
+  logoutFailure,
   LOGIN_REQUEST,
-  LOGIN_FAILED,
-  LOGIN_SUCCESSFUL,
-  LOGOUT_REQUEST,
-  LOGOUT_SUCCESSFUL,
-  LOGOUT_FAILED
+  FETCH_ME_REQUEST,
+  LOGIN_SUCCESS,
+  login,
+  LOGIN_FAILURE,
+  LOGOUT_FAILURE,
+  FETCH_ME_SUCCESS,
+  fetchMe,
+  FETCH_ME_FAILURE,
+  FETCH_ME_UNAUTHORIZED,
+  isAuthenticated
 } from "./auth";
 
-import { ME_AUTHENTICATED_REQUEST, ME_AUTHENTICATED_SUCCESS } from "./me";
-
 import configureMockStore from "redux-mock-store";
 import thunk from "redux-thunk";
 import fetchMock from "fetch-mock";
+import { LOGOUT_REQUEST, LOGOUT_SUCCESS } from "./auth";
 
-describe("action tests", () => {
+describe("auth reducer", () => {
+  it("should initialize in loading state ", () => {
+    const state = reducer();
+    expect(state.me.loading).toBeTruthy();
+  });
+
+  it("should set me and login on successful fetch of me", () => {
+    const state = reducer(undefined, fetchMeSuccess({ username: "tricia" }));
+    expect(state.me.loading).toBeFalsy();
+    expect(state.me.entry.username).toBe("tricia");
+    expect(state.login.authenticated).toBeTruthy();
+  });
+
+  it("should set authenticated to false", () => {
+    const initialState = {
+      login: {
+        authenticated: true
+      },
+      me: {
+        username: "tricia"
+      }
+    };
+    const state = reducer(initialState, fetchMeUnauthenticated());
+    expect(state.me.username).toBeUndefined();
+    expect(state.login.authenticated).toBeFalsy();
+  });
+
+  it("should reset the state after logout", () => {
+    const initialState = {
+      login: {
+        authenticated: true
+      },
+      me: {
+        username: "tricia"
+      }
+    };
+    const state = reducer(initialState, logoutSuccess());
+    expect(state.me.loading).toBeTruthy();
+    expect(state.me.entry).toBeFalsy();
+    expect(state.login).toBeUndefined();
+  });
+
+  it("should set state authenticated after login", () => {
+    const state = reducer(undefined, loginSuccess());
+    expect(state.login.authenticated).toBeTruthy();
+  });
+
+  it("should set me to loading", () => {
+    const state = reducer({ me: { loading: false } }, fetchMeRequest());
+    expect(state.me.loading).toBeTruthy();
+  });
+
+  it("should set login to loading", () => {
+    const state = reducer({ login: { loading: false } }, loginRequest());
+    expect(state.login.loading).toBeTruthy();
+  });
+
+  it("should set logout to loading", () => {
+    const state = reducer({ logout: { loading: false } }, logoutRequest());
+    expect(state.logout.loading).toBeTruthy();
+  });
+
+  it("should set me to error", () => {
+    const error = new Error("failed");
+    const state = reducer(undefined, fetchMeFailure(error));
+    expect(state.me.error).toBe(error);
+  });
+
+  it("should set login to error", () => {
+    const error = new Error("failed");
+    const state = reducer(undefined, loginFailure(error));
+    expect(state.login.error).toBe(error);
+  });
+
+  it("should set logout to error", () => {
+    const error = new Error("failed");
+    const state = reducer(undefined, logoutFailure(error));
+    expect(state.logout.error).toBe(error);
+  });
+});
+
+describe("auth actions", () => {
   const mockStore = configureMockStore([thunk]);
 
   afterEach(() => {
@@ -24,7 +117,7 @@ describe("action tests", () => {
     fetchMock.restore();
   });
 
-  test("login success", () => {
+  it("should dispatch login success and dispatch fetch me", () => {
     fetchMock.postOnce("/scm/api/rest/v2/auth/access_token", {
       body: {
         cookie: true,
@@ -44,8 +137,8 @@ describe("action tests", () => {
 
     const expectedActions = [
       { type: LOGIN_REQUEST },
-      { type: ME_AUTHENTICATED_REQUEST },
-      { type: LOGIN_SUCCESSFUL }
+      { type: FETCH_ME_REQUEST },
+      { type: LOGIN_SUCCESS }
     ];
 
     const store = mockStore({});
@@ -55,23 +148,73 @@ describe("action tests", () => {
     });
   });
 
-  test("login failed", () => {
+  it("should dispatch login failure", () => {
     fetchMock.postOnce("/scm/api/rest/v2/auth/access_token", {
       status: 400
     });
 
-    const expectedActions = [{ type: LOGIN_REQUEST }, { type: LOGIN_FAILED }];
+    const expectedActions = [{ type: LOGIN_REQUEST }, { type: LOGIN_FAILURE }];
 
     const store = mockStore({});
     return store.dispatch(login("tricia", "secret123")).then(() => {
       const actions = store.getActions();
       expect(actions[0].type).toEqual(LOGIN_REQUEST);
-      expect(actions[1].type).toEqual(LOGIN_FAILED);
+      expect(actions[1].type).toEqual(LOGIN_FAILURE);
       expect(actions[1].payload).toBeDefined();
     });
   });
 
-  test("logout success", () => {
+  it("should dispatch fetch me success", () => {
+    fetchMock.getOnce("/scm/api/rest/v2/me", {
+      body: { username: "sorbot" },
+      headers: { "content-type": "application/json" }
+    });
+
+    const expectedActions = [
+      { type: FETCH_ME_REQUEST },
+      { type: FETCH_ME_SUCCESS, payload: { username: "sorbot" } }
+    ];
+
+    const store = mockStore({});
+
+    return store.dispatch(fetchMe()).then(() => {
+      expect(store.getActions()).toEqual(expectedActions);
+    });
+  });
+
+  it("should dispatch fetch me failure", () => {
+    fetchMock.getOnce("/scm/api/rest/v2/me", {
+      status: 500
+    });
+
+    const store = mockStore({});
+    return store.dispatch(fetchMe()).then(() => {
+      const actions = store.getActions();
+      expect(actions[0].type).toEqual(FETCH_ME_REQUEST);
+      expect(actions[1].type).toEqual(FETCH_ME_FAILURE);
+      expect(actions[1].payload).toBeDefined();
+    });
+  });
+
+  it("should dispatch fetch me unauthorized", () => {
+    fetchMock.getOnce("/scm/api/rest/v2/me", {
+      status: 401
+    });
+
+    const expectedActions = [
+      { type: FETCH_ME_REQUEST },
+      { type: FETCH_ME_UNAUTHORIZED }
+    ];
+
+    const store = mockStore({});
+
+    return store.dispatch(fetchMe()).then(() => {
+      // return of async actions
+      expect(store.getActions()).toEqual(expectedActions);
+    });
+  });
+
+  it("should dispatch logout success", () => {
     fetchMock.deleteOnce("/scm/api/rest/v2/auth/access_token", {
       status: 204
     });
@@ -82,8 +225,8 @@ describe("action tests", () => {
 
     const expectedActions = [
       { type: LOGOUT_REQUEST },
-      { type: LOGOUT_SUCCESSFUL },
-      { type: ME_AUTHENTICATED_REQUEST }
+      { type: LOGOUT_SUCCESS },
+      { type: FETCH_ME_REQUEST }
     ];
 
     const store = mockStore({});
@@ -93,68 +236,39 @@ describe("action tests", () => {
     });
   });
 
-  test("logout failed", () => {
+  it("should dispatch logout failure", () => {
     fetchMock.deleteOnce("/scm/api/rest/v2/auth/access_token", {
       status: 500
     });
 
-    const expectedActions = [{ type: LOGOUT_REQUEST }, { type: LOGOUT_FAILED }];
+    const expectedActions = [
+      { type: LOGOUT_REQUEST },
+      { type: LOGOUT_FAILURE }
+    ];
 
     const store = mockStore({});
     return store.dispatch(logout()).then(() => {
       const actions = store.getActions();
       expect(actions[0].type).toEqual(LOGOUT_REQUEST);
-      expect(actions[1].type).toEqual(LOGOUT_FAILED);
+      expect(actions[1].type).toEqual(LOGOUT_FAILURE);
       expect(actions[1].payload).toBeDefined();
     });
   });
 });
 
-describe("reducer tests", () => {
-  test("login request", () => {
-    var newState = reducer({}, { type: LOGIN_REQUEST });
-    expect(newState.loading).toBeTruthy();
-    expect(newState.login).toBeFalsy();
-    expect(newState.error).toBeNull();
+describe("auth selectors", () => {
+  it("should be false", () => {
+    expect(isAuthenticated({})).toBeFalsy();
+    expect(isAuthenticated({ auth: {} })).toBeFalsy();
+    expect(isAuthenticated({ auth: { login: {} } })).toBeFalsy();
+    expect(
+      isAuthenticated({ auth: { login: { authenticated: false } } })
+    ).toBeFalsy();
   });
 
-  test("login successful", () => {
-    var newState = reducer({ login: false }, { type: LOGIN_SUCCESSFUL });
-    expect(newState.loading).toBeFalsy();
-    expect(newState.login).toBeTruthy();
-    expect(newState.error).toBe(null);
-  });
-
-  test("login failed", () => {
-    const err = new Error("error!");
-    var newState = reducer({}, { type: LOGIN_FAILED, payload: err });
-    expect(newState.loading).toBeFalsy();
-    expect(newState.login).toBeFalsy();
-    expect(newState.error).toBe(err);
-  });
-
-  test("logout request", () => {
-    var newState = reducer({ login: true }, { type: LOGOUT_REQUEST });
-    expect(newState.loading).toBeTruthy();
-    expect(newState.login).toBeTruthy();
-    expect(newState.error).toBeNull();
-  });
-
-  test("logout successful", () => {
-    var newState = reducer({ login: true }, { type: LOGOUT_SUCCESSFUL });
-    expect(newState.loading).toBeFalsy();
-    expect(newState.login).toBeFalsy();
-    expect(newState.error).toBeNull();
-  });
-
-  test("logout failed", () => {
-    const err = new Error("error!");
-    var newState = reducer(
-      { login: true },
-      { type: LOGOUT_FAILED, payload: err }
-    );
-    expect(newState.loading).toBeFalsy();
-    expect(newState.login).toBeTruthy();
-    expect(newState.error).toBe(err);
+  it("shuld be true", () => {
+    expect(
+      isAuthenticated({ auth: { login: { authenticated: true } } })
+    ).toBeTruthy();
   });
 });
diff --git a/scm-ui/src/modules/me.js b/scm-ui/src/modules/me.js
deleted file mode 100644
index 70631cc6c9..0000000000
--- a/scm-ui/src/modules/me.js
+++ /dev/null
@@ -1,98 +0,0 @@
-//@flow
-import { apiClient, NOT_AUTHENTICATED_ERROR } from "../apiclient";
-import type { Me } from "../types/me";
-
-const AUTHENTICATION_INFO_URL = "/me";
-
-export const ME_AUTHENTICATED_REQUEST = "scm/auth/me_request";
-export const ME_AUTHENTICATED_SUCCESS = "scm/auth/me_success";
-export const ME_AUTHENTICATED_FAILURE = "scm/auth/me_failure";
-export const ME_UNAUTHENTICATED = "scm/auth/me_unauthenticated";
-
-export function meRequest() {
-  return {
-    type: ME_AUTHENTICATED_REQUEST
-  };
-}
-
-export function meSuccess(user: Me) {
-  return {
-    type: ME_AUTHENTICATED_SUCCESS,
-    payload: user
-  };
-}
-
-export function meFailure(error: Error) {
-  return {
-    type: ME_AUTHENTICATED_FAILURE,
-    payload: error
-  };
-}
-
-export function meUnauthenticated() {
-  return {
-    type: ME_UNAUTHENTICATED
-  };
-}
-
-export function fetchMe() {
-  return function(dispatch: any => void) {
-    dispatch(meRequest());
-    return apiClient
-      .get(AUTHENTICATION_INFO_URL)
-      .then(response => {
-        return response.json();
-      })
-      .then(data => {
-        if (data) {
-          dispatch(meSuccess(data));
-        }
-      })
-      .catch((error: Error) => {
-        if (error === NOT_AUTHENTICATED_ERROR) {
-          dispatch(meUnauthenticated());
-        } else {
-          dispatch(meFailure(error));
-        }
-      });
-  };
-}
-
-export default function reducer(
-  state: any = { loading: true },
-  action: any = {}
-) {
-  switch (action.type) {
-    case ME_AUTHENTICATED_REQUEST:
-      return {
-        ...state,
-        loading: true,
-        me: null,
-        error: null
-      };
-    case ME_AUTHENTICATED_SUCCESS:
-      return {
-        ...state,
-        loading: false,
-        me: action.payload,
-        error: null
-      };
-    case ME_AUTHENTICATED_FAILURE:
-      return {
-        ...state,
-        loading: false,
-        me: null,
-        error: action.payload
-      };
-    case ME_UNAUTHENTICATED:
-      return {
-        ...state,
-        loading: false,
-        me: null,
-        error: null
-      };
-
-    default:
-      return state;
-  }
-}
diff --git a/scm-ui/src/modules/me.test.js b/scm-ui/src/modules/me.test.js
deleted file mode 100644
index 2d667765fa..0000000000
--- a/scm-ui/src/modules/me.test.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// @flow
-import reducer, {
-  ME_AUTHENTICATED_REQUEST,
-  ME_AUTHENTICATED_SUCCESS,
-  ME_AUTHENTICATED_FAILURE,
-  ME_UNAUTHENTICATED,
-  fetchMe
-} from "./me";
-
-import configureMockStore from "redux-mock-store";
-import thunk from "redux-thunk";
-import fetchMock from "fetch-mock";
-
-describe("fetch tests", () => {
-  const mockStore = configureMockStore([thunk]);
-
-  afterEach(() => {
-    fetchMock.reset();
-    fetchMock.restore();
-  });
-
-  test("successful me fetch", () => {
-    fetchMock.getOnce("/scm/api/rest/v2/me", {
-      body: { username: "sorbot" },
-      headers: { "content-type": "application/json" }
-    });
-
-    const expectedActions = [
-      { type: ME_AUTHENTICATED_REQUEST },
-      { type: ME_AUTHENTICATED_SUCCESS, payload: { username: "sorbot" } }
-    ];
-
-    const store = mockStore({});
-
-    return store.dispatch(fetchMe()).then(() => {
-      expect(store.getActions()).toEqual(expectedActions);
-    });
-  });
-
-  test("me fetch failed", () => {
-    fetchMock.getOnce("/scm/api/rest/v2/me", {
-      status: 500
-    });
-
-    const store = mockStore({});
-    return store.dispatch(fetchMe()).then(() => {
-      const actions = store.getActions();
-      expect(actions[0].type).toEqual(ME_AUTHENTICATED_REQUEST);
-      expect(actions[1].type).toEqual(ME_AUTHENTICATED_FAILURE);
-      expect(actions[1].payload).toBeDefined();
-    });
-  });
-
-  test("me fetch unauthenticated", () => {
-    fetchMock.getOnce("/scm/api/rest/v2/me", {
-      status: 401
-    });
-
-    const expectedActions = [
-      { type: ME_AUTHENTICATED_REQUEST },
-      { type: ME_UNAUTHENTICATED }
-    ];
-
-    const store = mockStore({});
-
-    return store.dispatch(fetchMe()).then(() => {
-      // return of async actions
-      expect(store.getActions()).toEqual(expectedActions);
-    });
-  });
-});
-
-describe("reducer tests", () => {
-  test("me request", () => {
-    var newState = reducer({}, { type: ME_AUTHENTICATED_REQUEST });
-    expect(newState.loading).toBeTruthy();
-    expect(newState.me).toBeNull();
-    expect(newState.error).toBeNull();
-  });
-
-  test("fetch me successful", () => {
-    const me = { username: "tricia" };
-    var newState = reducer({}, { type: ME_AUTHENTICATED_SUCCESS, payload: me });
-    expect(newState.loading).toBeFalsy();
-    expect(newState.me).toBe(me);
-    expect(newState.error).toBe(null);
-  });
-
-  test("fetch me failed", () => {
-    const err = new Error("error!");
-    var newState = reducer(
-      {},
-      { type: ME_AUTHENTICATED_FAILURE, payload: err }
-    );
-    expect(newState.loading).toBeFalsy();
-    expect(newState.me).toBeNull();
-    expect(newState.error).toBe(err);
-  });
-
-  test("me unauthenticated", () => {
-    var newState = reducer({}, { type: ME_UNAUTHENTICATED });
-    expect(newState.loading).toBeFalsy();
-    expect(newState.me).toBeNull();
-    expect(newState.error).toBeNull();
-  });
-});
diff --git a/scm-ui/src/users/modules/users.js b/scm-ui/src/users/modules/users.js
index 77392c72b0..2e1b3686f4 100644
--- a/scm-ui/src/users/modules/users.js
+++ b/scm-ui/src/users/modules/users.js
@@ -1,5 +1,5 @@
 // @flow
-import { apiClient, PAGE_NOT_FOUND_ERROR } from "../../apiclient";
+import { apiClient, NOT_FOUND_ERROR } from "../../apiclient";
 import type { User } from "../types/User";
 import { ThunkDispatch } from "redux-thunk";
 
@@ -61,7 +61,7 @@ export function fetchUsers() {
         dispatch(fetchUsersSuccess(data));
       })
       .catch(err => {
-        if (err === PAGE_NOT_FOUND_ERROR) {
+        if (err === NOT_FOUND_ERROR) {
           dispatch(usersNotFound(USERS_URL));
         } else {
           dispatch(failedToFetchUsers(USERS_URL, err));