diff --git a/src/base-container/index.jsx b/src/base-container/index.jsx
index 058031ad..c517aa16 100644
--- a/src/base-container/index.jsx
+++ b/src/base-container/index.jsx
@@ -23,16 +23,17 @@ import './index.scss';
  * @param {React.node} children - Required. The login or registration form.
  * @param {boolean} hasCloseButton - Optional. Denotes whether modal should have close button or not.
  * @param {string} size - Optional. Specifies size of modal.
+ * @param currentForm - Denotes the current opened form
  *
  * @returns {JSX.Element} The rendered login or registration form modal.
  */
 const BaseContainer = ({
-  children,
+  children = null,
   close,
   hasCloseButton = true,
   isOpen,
   size = 'lg',
-  currentForm,
+  currentForm = null,
 }) => {
   const dispatch = useDispatch();
 
@@ -79,12 +80,12 @@ const BaseContainer = ({
 };
 
 BaseContainer.propTypes = {
-  children: PropTypes.node.isRequired,
+  children: PropTypes.node,
   isOpen: PropTypes.bool.isRequired,
   close: PropTypes.func.isRequired,
   size: PropTypes.string,
   hasCloseButton: PropTypes.bool,
-  currentForm: PropTypes.string.isRequired,
+  currentForm: PropTypes.string,
 };
 
 export default BaseContainer;
diff --git a/src/forms/fields/marketing-email-opt-out-field/index.jsx b/src/forms/fields/marketing-email-opt-out-field/index.jsx
index f7a95994..d41f7ede 100644
--- a/src/forms/fields/marketing-email-opt-out-field/index.jsx
+++ b/src/forms/fields/marketing-email-opt-out-field/index.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { useIntl } from '@edx/frontend-platform/i18n';
-import { Form } from '@openedx/paragon';
+import { CheckboxControl, Form } from '@openedx/paragon';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 
@@ -23,7 +23,7 @@ const MarketingEmailOptInCheckbox = (props) => {
 
   return (
     <Form.Group controlId="marketingEmailsOptIn" className="mb-4">
-      <Form.Checkbox
+      <CheckboxControl
         name={name}
         className={classNames(
           'text-gray-800',
@@ -33,6 +33,7 @@ const MarketingEmailOptInCheckbox = (props) => {
         )}
         checked={!!value}
         onChange={handleChange}
+        aria-label="Checkbox"
       />
       <Form.Label className="registration-form__marketing_opt-in-label">
         {formatMessage(messages.registrationFormMarketingOptInLabel)}
diff --git a/src/forms/registration-popup/index.scss b/src/forms/registration-popup/index.scss
index 711a32d6..ebf81281 100644
--- a/src/forms/registration-popup/index.scss
+++ b/src/forms/registration-popup/index.scss
@@ -15,4 +15,5 @@
 .registration-form__marketing_opt-in-label {
   display: inline-block;
   vertical-align: middle;
+  pointer-events: none;
 }
\ No newline at end of file