diff --git a/src/_style.scss b/src/_style.scss
index af3b448b..17b80601 100644
--- a/src/_style.scss
+++ b/src/_style.scss
@@ -263,21 +263,6 @@ $apple-focus-black: $apple-black;
   padding-top: 10px;
 }
 
-.section-title {
-  width: 100%; 
-  text-align: center; 
-  border-bottom: 1px solid;
-  line-height: 0.1em;
-  margin-bottom: 2rem;
-  margin-top: 2rem;
-} 
-.section-title span { 
-   background:#fff; 
-   padding:0 20px;
-   color:#646464;
-   font-size: 20px;
-}
-
 @media (min-width: 576px) {
   .reset-password-container {
     width: 420px;
diff --git a/src/common-components/EnterpriseSSO.jsx b/src/common-components/EnterpriseSSO.jsx
index b23f5c38..d4b690a2 100644
--- a/src/common-components/EnterpriseSSO.jsx
+++ b/src/common-components/EnterpriseSSO.jsx
@@ -32,7 +32,7 @@ const EnterpriseSSO = (props) => {
       <div className="d-flex justify-content-center m-4">
         <div className="d-flex flex-column">
           <div className="mw-500">
-            <h3 className="section-title border-gray-200"><span className="text">Sign in</span></h3>
+            <h3>Sign in</h3>
             <Form className="m-0">
               <p>{intl.formatMessage(messages['enterprisetpa.title.heading'], { providerName: tpaProvider.name })}</p>
               <Button
@@ -60,7 +60,7 @@ const EnterpriseSSO = (props) => {
                     </>
                   )}
               </Button>
-              <h3 className="section-title border-gray-200"><span className="text">or</span></h3>
+              <div className="mb-4" />
               <Button
                 type="submit"
                 variant="primary"
diff --git a/src/data/utils/dataUtils.js b/src/data/utils/dataUtils.js
index 7d0908f3..05bc8752 100644
--- a/src/data/utils/dataUtils.js
+++ b/src/data/utils/dataUtils.js
@@ -25,3 +25,18 @@ export const getTpaProvider = (tpaHintProvider, primaryProviders, secondaryProvi
   }
   return tpaProvider;
 };
+
+export const processTpaHintURL = (params) => {
+  let tpaHint = null;
+  tpaHint = params.get('tpa_hint');
+  if (!tpaHint) {
+    const next = params.get('next');
+    if (next) {
+      const index = next.indexOf('tpa_hint=');
+      if (index !== -1) {
+        tpaHint = next.substring(index + 'tpa_hint='.length, next.length);
+      }
+    }
+  }
+  return tpaHint;
+};
diff --git a/src/data/utils/index.js b/src/data/utils/index.js
index ca817c73..96fe6c27 100644
--- a/src/data/utils/index.js
+++ b/src/data/utils/index.js
@@ -1,2 +1,2 @@
-export { default, getTpaProvider } from './dataUtils';
+export { default, getTpaProvider, processTpaHintURL } from './dataUtils';
 export { default as AsyncActionType } from './reduxUtils';
diff --git a/src/login/LoginPage.jsx b/src/login/LoginPage.jsx
index 83b7f9fe..fddff73a 100644
--- a/src/login/LoginPage.jsx
+++ b/src/login/LoginPage.jsx
@@ -31,7 +31,7 @@ import {
   DEFAULT_REDIRECT_URL, DEFAULT_STATE, LOGIN_PAGE, REGISTER_PAGE, ENTERPRISE_LOGIN_URL, PENDING_STATE,
 } from '../data/constants';
 import { forgotPasswordResultSelector } from '../forgot-password';
-import { getTpaProvider } from '../data/utils';
+import { getTpaProvider, processTpaHintURL } from '../data/utils';
 
 class LoginPage extends React.Component {
   constructor(props, context) {
@@ -52,11 +52,11 @@ class LoginPage extends React.Component {
 
   componentDidMount() {
     const params = (new URL(document.location)).searchParams;
-    const tpaHint = params.get('tpa_hint');
     const payload = {
       redirect_to: params.get('next') || DEFAULT_REDIRECT_URL,
     };
 
+    const tpaHint = processTpaHintURL(params);
     if (tpaHint) {
       payload.tpa_hint = tpaHint;
     }
@@ -266,7 +266,7 @@ class LoginPage extends React.Component {
 
     const params = (new URL(window.location.href)).searchParams;
 
-    const tpaHint = params.get('tpa_hint');
+    const tpaHint = processTpaHintURL(params);
     if (tpaHint) {
       if (thirdPartyAuthApiStatus === PENDING_STATE) {
         return <Skeleton height={36} />;
diff --git a/src/register/RegistrationPage.jsx b/src/register/RegistrationPage.jsx
index 911c1a50..b40d276f 100644
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -30,7 +30,7 @@ import EnterpriseSSO from '../common-components/EnterpriseSSO';
 import {
   DEFAULT_REDIRECT_URL, DEFAULT_STATE, LOGIN_PAGE, PENDING_STATE, REGISTER_PAGE,
 } from '../data/constants';
-import { getTpaProvider } from '../data/utils';
+import { getTpaProvider, processTpaHintURL } from '../data/utils';
 
 class RegistrationPage extends React.Component {
   constructor(props, context) {
@@ -73,11 +73,11 @@ class RegistrationPage extends React.Component {
 
   componentDidMount() {
     const params = (new URL(document.location)).searchParams;
-    const tpaHint = params.get('tpa_hint');
     const payload = {
       redirect_to: params.get('next') || DEFAULT_REDIRECT_URL,
     };
 
+    const tpaHint = processTpaHintURL(params);
     if (tpaHint) {
       payload.tpa_hint = tpaHint;
     }
@@ -585,7 +585,7 @@ class RegistrationPage extends React.Component {
     } = this.props.thirdPartyAuthContext;
 
     const params = (new URL(window.location.href)).searchParams;
-    const tpaHint = params.get('tpa_hint');
+    const tpaHint = processTpaHintURL(params);
 
     if (tpaHint) {
       if (thirdPartyAuthApiStatus === PENDING_STATE) {