diff --git a/src/App.tsx b/src/App.tsx
index b3b0948..5e6485c 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -67,6 +67,11 @@ const App: React.FC = () => {
                           exact
                           component={Settings}
                         />
+                        <Route
+                          path={Routes.VERIFY_EMAIL}
+                          exact
+                          component={VerifyEmail}
+                        />
                         <Route path="*" exact component={NotFound} />
                       </Switch>
                     );
diff --git a/src/containers/signup/index.tsx b/src/containers/signup/index.tsx
index 8716581..ecc4919 100644
--- a/src/containers/signup/index.tsx
+++ b/src/containers/signup/index.tsx
@@ -19,12 +19,19 @@ const { Title, Paragraph } = Typography;
 
 type SignupProps = UserAuthenticationReducerState;
 
+interface SignupFormData extends SignupRequest {
+  confirmPassword: string;
+}
+
 const Signup: React.FC<SignupProps> = ({ tokens }) => {
   const dispatch = useDispatch();
   const history = useHistory();
 
-  const onFinish = (values: SignupRequest) => {
-    dispatch(signup(values));
+  const onFinish = (values: SignupFormData) => {
+    // confirmPassword is checked in the form but should not be sent in the request
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { confirmPassword, ...request } = values;
+    dispatch(signup(request));
   };
 
   if (getPrivilegeLevel(tokens) !== PrivilegeLevel.NONE) {
@@ -64,14 +71,6 @@ const Signup: React.FC<SignupProps> = ({ tokens }) => {
             <Input />
           </Form.Item>
 
-          <Form.Item
-            label="Username"
-            name="username"
-            rules={[{ required: true, message: 'Required' }]}
-          >
-            <Input />
-          </Form.Item>
-
           <Form.Item
             label="Password"
             name="password"