diff --git a/embark-ui/src/components/AuthError.js b/embark-ui/src/components/AuthError.js
new file mode 100644
index 000000000..38eaccceb
--- /dev/null
+++ b/embark-ui/src/components/AuthError.js
@@ -0,0 +1,24 @@
+import PropTypes from "prop-types";
+import React from 'react';
+import {Page, Alert, Form, Button} from "tabler-react";
+
+const AuthError = ({error}) => {
+  return <Page.Content>
+    <Alert type="danger">
+      {error}
+    </Alert>
+    <Form>
+      <Form.Input name="token" label="Token" placeholder="Enter Token"/>
+      <Button type="submit" color="primary">
+        Authorize
+      </Button>
+    </Form>
+  </Page.Content>;
+};
+
+AuthError.propTypes = {
+  error: PropTypes.string.isRequired
+};
+
+export default AuthError;
+
diff --git a/embark-ui/src/containers/AppContainer.js b/embark-ui/src/containers/AppContainer.js
index 928983d85..3480d5321 100644
--- a/embark-ui/src/containers/AppContainer.js
+++ b/embark-ui/src/containers/AppContainer.js
@@ -2,9 +2,9 @@ import PropTypes from "prop-types";
 import {connect} from 'react-redux';
 import React, {Component} from 'react';
 import {withRouter} from "react-router-dom";
-import {Alert, Page, Form, Button} from "tabler-react";
 
 import routes from '../routes';
+import AuthError from '../components/AuthError';
 import queryString from 'query-string';
 
 import {
@@ -52,17 +52,7 @@ class AppContainer extends Component {
 
   render() {
     if (this.state.authenticateError) {
-      return <Page.Content>
-        <Alert type="danger">
-          {this.state.authenticateError}
-        </Alert>
-        <Form>
-          <Form.Input name="token" label="Token" placeholder="Enter Token"/>
-          <Button type="submit" color="primary">
-            Authorize
-          </Button>
-        </Form>
-      </Page.Content>;
+      return <AuthError error={this.state.authenticateError}/>;
     }
     return (<React.Fragment>{routes}</React.Fragment>);
   }