diff --git a/packages/components/Signup/Signup.jsx b/packages/components/Signup/Signup.jsx
index 5c02d7c4d3865998686f06394a82fd82b5102c94..54a50abb2345e9ae3bdd1148bd921ddaf4db5bf1 100644
--- a/packages/components/Signup/Signup.jsx
+++ b/packages/components/Signup/Signup.jsx
@@ -21,11 +21,11 @@ const Logo = styled.div`
 `
 
 const UsernameInput = props => (
-  <TextField label="Username" {...props.input} placeholder="Username" />
+  <TextField label="Username" {...props.field} placeholder="Username" />
 )
 
 const EmailInput = props => (
-  <TextField label="Email" {...props.input} placeholder="Email" type="email" />
+  <TextField label="Email" {...props.field} placeholder="Email" type="email" />
 )
 const PasswordInput = props => (
   <TextField
diff --git a/packages/components/Signup/SignupContainer.js b/packages/components/Signup/SignupContainer.js
new file mode 100644
index 0000000000000000000000000000000000000000..589fb5d48f365c74600ff1f830528bac8e395671
--- /dev/null
+++ b/packages/components/Signup/SignupContainer.js
@@ -0,0 +1,21 @@
+import { compose } from 'recompose'
+import { withFormik } from 'formik'
+
+import { signupUser } from './actions'
+import Signup from './Signup'
+
+const handleSubmit = (values, dispatch) => {
+  dispatch(signupUser(values))
+}
+
+const enhancedFormik = withFormik({
+  initialValues: {
+    username: '',
+    email: '',
+    password: '',
+  },
+  displayName: 'signup',
+  handleSubmit,
+})(Signup)
+
+export default compose()(enhancedFormik)