diff --git a/webclient/src/components/InputField/InputField.tsx b/webclient/src/components/InputField/InputField.tsx
index 92207069..20e8515f 100644
--- a/webclient/src/components/InputField/InputField.tsx
+++ b/webclient/src/components/InputField/InputField.tsx
@@ -38,6 +38,7 @@ const InputField = ({ input, meta: { touched, error, warning }, ...args }) => {
       ) }
 
       <TextField
+        autoComplete='off'
         { ...input }
         { ...args }
         className="rounded"
diff --git a/webclient/src/containers/Login/Login.tsx b/webclient/src/containers/Login/Login.tsx
index 8a54a348..40555ca1 100644
--- a/webclient/src/containers/Login/Login.tsx
+++ b/webclient/src/containers/Login/Login.tsx
@@ -159,6 +159,10 @@ const Login = ({ state, description }: LoginProps) => {
     });
   };
 
+  const handleAccountActivationDialogSubmit = ({ token }) => {
+    AuthenticationService.activateAccount({ token } as any);
+  };
+
   const handleRequestPasswordResetDialogSubmit = (form) => {
     const { userName, email, selectedHost } = form;
     const { host, port } = getHostPort(selectedHost);
@@ -173,11 +177,8 @@ const Login = ({ state, description }: LoginProps) => {
 
   const handleResetPasswordDialogSubmit = ({ userName, token, newPassword, selectedHost }) => {
     const { host, port } = getHostPort(selectedHost);
-    AuthenticationService.resetPassword({ userName, token, newPassword, host, port } as any);
-  };
 
-  const handleAccountActivationDialogSubmit = ({ token }) => {
-    AuthenticationService.activateAccount({ token } as any);
+    AuthenticationService.resetPassword({ userName, token, newPassword, host, port } as any);
   };
 
   const skipTokenRequest = (userName) => {
diff --git a/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx b/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx
index 1a821ada..f3ecde71 100644
--- a/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx
+++ b/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx
@@ -21,9 +21,12 @@ const AccountActivationForm = ({ onSubmit }) => {
     setErrorMessage(true);
   }, ServerTypes.ACCOUNT_ACTIVATION_FAILED, []);
 
-  const handleOnSubmit = (form) => {
+  const handleOnSubmit = ({ token, ...values }) => {
     setErrorMessage(false);
-    onSubmit(form);
+
+    token = token?.trim();
+
+    onSubmit({ token, ...values });
   }
 
   const validate = values => {
@@ -42,7 +45,7 @@ const AccountActivationForm = ({ onSubmit }) => {
         return (
           <form className="AccountActivationForm" onSubmit={handleSubmit}>
             <div className="AccountActivationForm-item">
-              <Field label="Token" name="token" component={InputField} autoComplete="off" />
+              <Field label="Token" name="token" component={InputField} />
             </div>
 
             {errorMessage && (
diff --git a/webclient/src/forms/ConnectForm/ConnectForm.css b/webclient/src/forms/ConnectForm/ConnectForm.css
deleted file mode 100644
index 9b41eaad..00000000
--- a/webclient/src/forms/ConnectForm/ConnectForm.css
+++ /dev/null
@@ -1,18 +0,0 @@
-.connectForm {
-  width: 100%;
-  padding: 20px;
-}
-
-.connectForm-item {
-  display: flex;
-  flex-direction: column;
-}
-
-.connectForm-submit.MuiButton-root {
-  display: block;
-  margin: 20px auto 0;
-}
-
-.selectKnownHosts-items {
-  margin-bottom: 4px;
-}
\ No newline at end of file
diff --git a/webclient/src/forms/ConnectForm/ConnectForm.tsx b/webclient/src/forms/ConnectForm/ConnectForm.tsx
deleted file mode 100644
index 267245d0..00000000
--- a/webclient/src/forms/ConnectForm/ConnectForm.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-// eslint-disable-next-line
-import React, { useState } from "react";
-import { connect } from 'react-redux';
-import { Form, Field, reduxForm, change } from 'redux-form'
-
-import Button from '@material-ui/core/Button';
-
-import { InputField } from 'components';
-import { FormKey, KnownHost, KnownHosts } from 'types';
-
-import './ConnectForm.css';
-import { Select, MenuItem } from '@material-ui/core';
-
-const ConnectForm = (props) => {
-  const { handleSubmit, dispatch } = props;
-  const [knownHosts, setKnownHosts] = useState(KnownHost.ROOSTER);
-
-  const handleChange = (event) => {
-    setKnownHosts(event.target.value);
-    dispatch(change(FormKey.CONNECT, 'host', KnownHosts[event.target.value].host));
-    dispatch(change(FormKey.CONNECT, 'port', KnownHosts[event.target.value].port))
-  };
-
-  return (
-    <Form className="connectForm" onSubmit={handleSubmit}>
-      <div className="connectForm-item">
-        <Select
-          labelId="selectedKnownHosts-label"
-          id="selectedKnownHosts-label"
-          className="selectKnownHosts-items"
-          value={knownHosts}
-          fullWidth={true}
-          onChange={handleChange}
-        >
-          <MenuItem value={KnownHost.ROOSTER}>{KnownHost.ROOSTER}</MenuItem>
-          <MenuItem value={KnownHost.TETRARCH}>{KnownHost.TETRARCH}</MenuItem>
-        </Select>
-      </div>
-      <div className="connectForm-item">
-        <Field label="Host" name="host" component={InputField} />
-      </div>
-      <div className="connectForm-item">
-        <Field label="Port" name="port" component={InputField} />
-      </div>
-      <div className="connectForm-item">
-        <Field label="User" name="user" component={InputField} autoComplete="username" />
-      </div>
-      <div className="connectForm-item">
-        <Field label="Pass" name="pass" type="password" component={InputField} autoComplete="current-password" />
-      </div>
-      <Button className="connectForm-submit" color="primary" variant="contained" type="submit">
-        Connect
-      </Button>
-    </Form>
-  );
-};
-
-const propsMap = {
-  form: FormKey.CONNECT
-};
-
-const mapStateToProps = () => ({
-  initialValues: {
-    // host: "mtg.tetrarch.co/servatrice",
-    // port: "443"
-    host: 'server.cockatrice.us',
-    port: '4748'
-  }
-});
-
-export default connect(mapStateToProps)(reduxForm(propsMap)(ConnectForm));
diff --git a/webclient/src/forms/KnownHostForm/KnownHostForm.tsx b/webclient/src/forms/KnownHostForm/KnownHostForm.tsx
index 4f0cb9f9..4848eb7e 100644
--- a/webclient/src/forms/KnownHostForm/KnownHostForm.tsx
+++ b/webclient/src/forms/KnownHostForm/KnownHostForm.tsx
@@ -33,6 +33,13 @@ const KnownHostForm = ({ host, onRemove, onSubmit }) => {
     }
   };
 
+  const handleOnSubmit = ({ name, host, ...values }) => {
+    name = name?.trim();
+    host = host?.trim();
+
+    onSubmit({ name, host, ...values });
+  }
+
   return (
     <Form
       initialValues={{
@@ -41,7 +48,7 @@ const KnownHostForm = ({ host, onRemove, onSubmit }) => {
         host: host?.host,
         port: host?.port,
       }}
-      onSubmit={onSubmit}
+      onSubmit={handleOnSubmit}
       validate={validate}
     >
       {({ handleSubmit }) => (
diff --git a/webclient/src/forms/LoginForm/LoginForm.tsx b/webclient/src/forms/LoginForm/LoginForm.tsx
index 0f3779b5..8c3c2231 100644
--- a/webclient/src/forms/LoginForm/LoginForm.tsx
+++ b/webclient/src/forms/LoginForm/LoginForm.tsx
@@ -26,9 +26,6 @@ const LoginForm = ({ onSubmit, disableSubmitButton, onResetPassword }: LoginForm
     if (!values.userName) {
       errors.userName = 'Required';
     }
-    if (!values.password && !values.selectedHost?.hashedPassword) {
-      errors.password = 'Required';
-    }
     if (!values.selectedHost) {
       errors.selectedHost = 'Required';
     }
@@ -41,8 +38,14 @@ const LoginForm = ({ onSubmit, disableSubmitButton, onResetPassword }: LoginForm
     setPasswordLabel(useStoredLabel ? STORED_PASSWORD_LABEL : PASSWORD_LABEL);
   };
 
+  const handleOnSubmit = ({ userName, ...values }) => {
+    userName = userName?.trim();
+
+    onSubmit({ userName, ...values });
+  }
+
   return (
-    <Form onSubmit={onSubmit} validate={validate}>
+    <Form onSubmit={handleOnSubmit} validate={validate}>
       {({ handleSubmit, form }) => {
         const { values } = form.getState();
 
@@ -109,7 +112,7 @@ const LoginForm = ({ onSubmit, disableSubmitButton, onResetPassword }: LoginForm
           <form className='loginForm' onSubmit={handleSubmit}>
             <div className='loginForm-items'>
               <div className='loginForm-item'>
-                <Field label='Username' name='userName' component={InputField} autoComplete='off' />
+                <Field label='Username' name='userName' component={InputField} autoComplete='username' />
                 <OnChange name="userName">{onUserNameChange}</OnChange>
               </div>
               <div className='loginForm-item'>
diff --git a/webclient/src/forms/RegisterForm/RegisterForm.tsx b/webclient/src/forms/RegisterForm/RegisterForm.tsx
index 904e6ec4..f2ab0a4e 100644
--- a/webclient/src/forms/RegisterForm/RegisterForm.tsx
+++ b/webclient/src/forms/RegisterForm/RegisterForm.tsx
@@ -47,9 +47,14 @@ const RegisterForm = ({ onSubmit }: RegisterFormProps) => {
     setUserNameError(error);
   }, ServerTypes.REGISTRATION_USERNAME_ERROR);
 
-  const handleOnSubmit = form => {
+  const handleOnSubmit = ({ userName, email, realName, ...values }) => {
     setError(null);
-    onSubmit(form);
+
+    userName = userName?.trim();
+    email = email?.trim();
+    realName = realName?.trim();
+
+    onSubmit({ userName, email, realName, ...values });
   }
 
   const validate = values => {
@@ -100,10 +105,10 @@ const RegisterForm = ({ onSubmit }: RegisterFormProps) => {
 
         return (
           <>
-            <form className="RegisterForm" onSubmit={handleSubmit} autoComplete="off">
+            <form className="RegisterForm" onSubmit={handleSubmit}>
               <div className="RegisterForm-column">
                 <div className="RegisterForm-item">
-                  <Field label="Player Name" name="userName" component={InputField} />
+                  <Field label="Player Name" name="userName" component={InputField} autoComplete="username" />
                   <OnChange name="userName">{onUserNameChange}</OnChange>
                 </div>
                 <div className="RegisterForm-item">
@@ -126,7 +131,7 @@ const RegisterForm = ({ onSubmit }: RegisterFormProps) => {
               </div>
               <div className="RegisterForm-column" >
                 <div className="RegisterForm-item">
-                  <Field label="Real Name" name="realName" component={InputField} autoComplete='off' />
+                  <Field label="Real Name" name="realName" component={InputField} />
                 </div>
                 <div className="RegisterForm-item">
                   <Field label="Email" name="email" type="email" component={InputField} />
diff --git a/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx
index c7cf2706..c76197df 100644
--- a/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx
+++ b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx
@@ -26,9 +26,13 @@ const RequestPasswordResetForm = ({ onSubmit, skipTokenRequest }) => {
     setIsMFA(true);
   }, ServerTypes.RESET_PASSWORD_CHALLENGE, []);
 
-  const handleOnSubmit = (form) => {
+  const handleOnSubmit = ({ userName, email, ...values }) => {
     setErrorMessage(false);
-    onSubmit(form);
+
+    userName = userName?.trim();
+    email = email?.trim();
+
+    onSubmit({ userName, email, ...values });
   }
 
   const validate = values => {
@@ -63,7 +67,7 @@ const RequestPasswordResetForm = ({ onSubmit, skipTokenRequest }) => {
               </div>
               {isMFA ? (
                 <div className="RequestPasswordResetForm-item">
-                  <Field label="Email" name="email" component={InputField} autoComplete="email" />
+                  <Field label="Email" name="email" type="email" component={InputField} autoComplete="email" />
                   <div>Server has multi-factor authentication enabled</div>
                 </div>
               ) : null}
diff --git a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
index 154fe59f..19bbc8d5 100644
--- a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
+++ b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
@@ -49,8 +49,15 @@ const ResetPasswordForm = ({ onSubmit, userName }) => {
     return errors;
   };
 
+  const handleOnSubmit = ({ userName, token, ...values }) => {
+    userName = userName?.trim();
+    token = token?.trim();
+
+    onSubmit({ userName, token, ...values });
+  }
+
   return (
-    <Form onSubmit={onSubmit} validate={validate} initialValues={{ userName }}>
+    <Form onSubmit={handleOnSubmit} validate={validate} initialValues={{ userName }}>
       {({ handleSubmit, form }) => (
         <form className='ResetPasswordForm' onSubmit={handleSubmit}>
           <div className='ResetPasswordForm-items'>
diff --git a/webclient/src/forms/index.ts b/webclient/src/forms/index.ts
index 1740694a..b922a9f4 100644
--- a/webclient/src/forms/index.ts
+++ b/webclient/src/forms/index.ts
@@ -1,6 +1,5 @@
 export { default as AccountActivationForm } from './AccountActivationForm/AccountActivationForm';
 export { default as CardImportForm } from './CardImportForm/CardImportForm';
-export { default as ConnectForm } from './ConnectForm/ConnectForm';
 export { default as LoginForm } from './LoginForm/LoginForm';
 export { default as KnownHostForm } from './KnownHostForm/KnownHostForm';
 export { default as RegisterForm } from './RegisterForm/RegisterForm';