diff --git a/package-lock.json b/package-lock.json
index 4ea9065..e39deab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2496,14 +2496,14 @@
       }
     },
     "@edx/frontend-component-footer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-2.0.1.tgz",
-      "integrity": "sha512-r2AaMMgJJob+KUd0JTdEVGtzvOaQO/SWPecGHORhPOBqbSCjtgbM2uE86ahuFAkK/bFBBo/kXLUi7YkSd4SriA=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-2.0.3.tgz",
+      "integrity": "sha512-HSUs9vDZ18enSY5km15cFdt8WhBqippEaQZwtOBH2zX4iEtHb6kV0lX7gHD++Vnm/UCgJkvcbWZ7tFDImikvPA=="
     },
     "@edx/frontend-component-site-header": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@edx/frontend-component-site-header/-/frontend-component-site-header-2.0.2.tgz",
-      "integrity": "sha512-/lbL1+URyZhUlMZ8Dcki56ynGKgCS0YOkB2GoShb5UM9eruQW7Qr6ZO/q03vB7ERlI74VRBwVOqL1ipjMkzqUA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-component-site-header/-/frontend-component-site-header-2.0.3.tgz",
+      "integrity": "sha512-sigrkq5GFEFp0C+UKs3DTh0gRPs+khQ7VWzf0j48RqZPCilJGIXyKyW6aayDzrlNmHxXGzGDfxuPHgYV8RlBvA==",
       "requires": {
         "classnames": "^2.2.6",
         "lodash": "^4.17.11",
diff --git a/package.json b/package.json
index 2ddc1f0..dacd5fe 100755
--- a/package.json
+++ b/package.json
@@ -28,8 +28,8 @@
     "@cospired/i18n-iso-languages": "^2.0.2",
     "@edx/edx-bootstrap": "git://github.com/edx/edx-bootstrap.git#update-with-documentation-site",
     "@edx/frontend-auth": "^2.0.0",
-    "@edx/frontend-component-footer": "^2.0.0",
-    "@edx/frontend-component-site-header": "^2.0.2",
+    "@edx/frontend-component-footer": "^2.0.3",
+    "@edx/frontend-component-site-header": "^2.0.3",
     "@edx/paragon": "^3.8.3",
     "@fortawesome/fontawesome-svg-core": "^1.2.14",
     "@fortawesome/free-brands-svg-icons": "^5.7.2",
diff --git a/src/components/ProfilePage/Country.jsx b/src/components/ProfilePage/Country.jsx
index 5b27f04..b7959a4 100644
--- a/src/components/ProfilePage/Country.jsx
+++ b/src/components/ProfilePage/Country.jsx
@@ -63,6 +63,7 @@ class Country extends React.Component {
                 <Label for="country">Location</Label>
                 <Input
                   type="select"
+                  id={formId}
                   name={formId}
                   className="w-100"
                   value={country}
diff --git a/src/components/ProfilePage/Education.jsx b/src/components/ProfilePage/Education.jsx
index d6f6054..95be555 100644
--- a/src/components/ProfilePage/Education.jsx
+++ b/src/components/ProfilePage/Education.jsx
@@ -67,6 +67,7 @@ class Education extends React.Component {
                 </Label>
                 <Input
                   type="select"
+                  id={formId}
                   name={formId}
                   className="w-100"
                   value={education}
diff --git a/src/components/ProfilePage/Name.jsx b/src/components/ProfilePage/Name.jsx
index 77b672b..4a5ace2 100644
--- a/src/components/ProfilePage/Name.jsx
+++ b/src/components/ProfilePage/Name.jsx
@@ -60,7 +60,7 @@ class Name extends React.Component {
             <Form onSubmit={this.handleSubmit}>
               <FormGroup>
                 <Label for="name">Full Name</Label>
-                <Input type="text" name={formId} value={name} invalid={error != null} onChange={this.handleChange} />
+                <Input type="text" id={formId} name={formId} value={name} invalid={error != null} onChange={this.handleChange} />
                 <FormText>
                   <FormattedMessage
                     id="profile.name.details"
diff --git a/src/components/ProfilePage/PreferredLanguage.jsx b/src/components/ProfilePage/PreferredLanguage.jsx
index 4acb8c2..d4a3a2d 100644
--- a/src/components/ProfilePage/PreferredLanguage.jsx
+++ b/src/components/ProfilePage/PreferredLanguage.jsx
@@ -70,7 +70,7 @@ class PreferredLanguage extends React.Component {
           editing: (
             <Form onSubmit={this.handleSubmit}>
               <FormGroup>
-                <Label for="language">
+                <Label for={formId}>
                   <FormattedMessage
                     id="profile.preferredlanguage.label"
                     defaultMessage="Language"
@@ -79,6 +79,7 @@ class PreferredLanguage extends React.Component {
                 </Label>
                 <Input
                   type="select"
+                  id={formId}
                   name={formId}
                   className="w-100"
                   value={value}
diff --git a/src/components/ProfilePage/SocialLinks.jsx b/src/components/ProfilePage/SocialLinks.jsx
index 6f18959..f2792e8 100644
--- a/src/components/ProfilePage/SocialLinks.jsx
+++ b/src/components/ProfilePage/SocialLinks.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Form, Input, FormFeedback, Alert } from 'reactstrap';
+import { Form, Input, Label, FormFeedback, Alert } from 'reactstrap';
 import { connect } from 'react-redux';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTwitter, faFacebook, faLinkedin } from '@fortawesome/free-brands-svg-icons';
@@ -271,9 +271,10 @@ function EditingListItem({
 }) {
   return (
     <li className="form-group">
-      <h6>{name}</h6>
+      <Label for={`social-${platform}`}>{name}</Label>
       <Input
         type="text"
+        id={`social-${platform}`}
         name={platform}
         value={value || ''}
         onChange={onChange}