diff --git a/shared/components/SignupForm/SignupForm.jsx b/shared/components/SignupForm/SignupForm.jsx
new file mode 100644
index 00000000..29aceab1
--- /dev/null
+++ b/shared/components/SignupForm/SignupForm.jsx
@@ -0,0 +1,18 @@
+import React from 'react'
+
+class SignupForm extends React.Component {
+	render() {
+		const {fields: { username, email, password, confirmPassword }, handleSubmit} = this.props;
+		return (
+			<form onSubmit={handleSubmit(this.props.signUpUser.bind(this))}>
+				<input type="text" placeholder="Username" {...username}/>
+				<input type="text" placeholder="Email" {...email}/>
+				<input type="password" placeholder="Password" {...password}/>
+				<input type="password" placeholder="Confirm Password" {...confirmPassword}/>
+				<input type="submit" value="Sign Up" />
+			</form>
+		)
+	}
+}
+
+export default SignupForm;
\ No newline at end of file
diff --git a/shared/containers/SignupView/SignupView.jsx b/shared/containers/SignupView/SignupView.jsx
index e1f92f90..00018e9e 100644
--- a/shared/containers/SignupView/SignupView.jsx
+++ b/shared/containers/SignupView/SignupView.jsx
@@ -3,18 +3,12 @@ import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import * as UserActions from '../../redux/actions/user'
 import { reduxForm } from 'redux-form'
+import SignupForm from '../../components/SignupForm/SignupForm'
 
 class SignupView extends React.Component {
 	render() {
-		const {fields: { username, email, password, confirmPassword }, handleSubmit} = this.props;
 		return (
-			<form onSubmit={handleSubmit(this.props.signUpUser.bind(this))}>
-				<input type="text" placeholder="Username" {...username}/>
-				<input type="text" placeholder="Email" {...email}/>
-				<input type="password" placeholder="Password" {...password}/>
-				<input type="password" placeholder="Confirm Password" {...confirmPassword}/>
-				<input type="submit" value="Sign Up" />
-			</form>
+			<SignupForm {...this.props} />
 		)
 	}
 }