diff --git a/src/components/join-flow/gender-step.jsx b/src/components/join-flow/gender-step.jsx
index ec6b23870..ac1d20671 100644
--- a/src/components/join-flow/gender-step.jsx
+++ b/src/components/join-flow/gender-step.jsx
@@ -99,6 +99,12 @@ class GenderStep extends React.Component {
                                 value="Male"
                                 onSetFieldValue={setFieldValue}
                             />
+                            <GenderOption
+                                label={this.props.intl.formatMessage({id: 'general.nonBinary'})}
+                                selectedValue={values.gender}
+                                value="Non-binary"
+                                onSetFieldValue={setFieldValue}
+                            />
                             <div
                                 className={classNames(
                                     'col-sm-9',
diff --git a/src/l10n.json b/src/l10n.json
index dc0d02c59..098033b98 100644
--- a/src/l10n.json
+++ b/src/l10n.json
@@ -62,6 +62,7 @@
     "general.noDeletionTitle": "Your Account Will Not Be Deleted",
     "general.noDeletionDescription": "Your account was scheduled for deletion but you logged in. Your account has been reactivated. If you didn’t request for your account to be deleted, you should {resetLink} to make sure your account is secure.",
     "general.noDeletionLink": "change your password",
+    "general.nonBinary": "Non-binary",
     "general.notRequired": "Not Required",
     "general.okay": "Okay",
     "general.other": "Other",