diff --git a/CHANGELOG.md b/CHANGELOG.md
index a429ab8cf..a21872eb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,7 +55,6 @@
     in an infinite loading loop in some scenarios.
 
 
-
 ### 0.4.40 (5/19/16)
 
 - Fixes:
diff --git a/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx b/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
index e0b845fd0..b6fe1bf09 100644
--- a/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
+++ b/internal_packages/onboarding/lib/decorators/create-page-for-form.jsx
@@ -56,7 +56,11 @@ const CreatePageForForm = (FormComponent) => {
 
     onFieldChange = (event) => {
       const changes = {};
-      changes[event.target.id] = event.target.value;
+      if (event.target.type === 'checkbox') {
+        changes[event.target.id] = event.target.checked;
+      } else {
+        changes[event.target.id] = event.target.value;
+      }
 
       const accountInfo = Object.assign({}, this.state.accountInfo, changes);
       const {errorFieldNames, errorMessage, populated} = FormComponent.validateAccountInfo(accountInfo);
diff --git a/internal_packages/onboarding/lib/form-field.jsx b/internal_packages/onboarding/lib/form-field.jsx
index 30fc04754..2e187bf43 100644
--- a/internal_packages/onboarding/lib/form-field.jsx
+++ b/internal_packages/onboarding/lib/form-field.jsx
@@ -3,7 +3,7 @@ import React from 'react';
 const FormField = (props) => {
   return (
     <span>
-      <label forHtml={props.field}>{props.title}:</label>
+      <label htmlFor={props.field}>{props.title}:</label>
       <input
         type={props.type || "text"}
         id={props.field}
diff --git a/internal_packages/onboarding/lib/page-account-settings-imap.jsx b/internal_packages/onboarding/lib/page-account-settings-imap.jsx
index 6d32b95c7..0bad8682d 100644
--- a/internal_packages/onboarding/lib/page-account-settings-imap.jsx
+++ b/internal_packages/onboarding/lib/page-account-settings-imap.jsx
@@ -73,7 +73,7 @@ class AccountIMAPSettingsForm extends React.Component {
             onKeyPress={onFieldKeyPress}
             onChange={onFieldChange}
           />
-          <label forHtml={`ssl_required`} className="checkbox">Require SSL</label>
+          <label htmlFor={`ssl_required`} className="checkbox">Require SSL</label>
         </div>
         <FormField field={`${type}_username`} title={"Username"} {...this.props} />
         <FormField field={`${type}_password`} title={"Password"} type="password" {...this.props} />