diff --git a/client/src/components/Donation/Donation.js b/client/src/components/Donation/Donation.js
index 8006a1af2a..515fc1270a 100644
--- a/client/src/components/Donation/Donation.js
+++ b/client/src/components/Donation/Donation.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
@@ -40,7 +40,7 @@ const propTypes = {
 
 const stripeKey = 'pk_live_E6Z6xPM8pEsJziHW905zpAvF';
 
-class DonationModal extends PureComponent {
+class DonationModal extends Component {
   constructor(...props) {
     super(...props);
     this.state = {
diff --git a/client/src/components/Donation/components/CardForm.js b/client/src/components/Donation/components/CardForm.js
index 0a4b39f1bd..5da0f1be26 100644
--- a/client/src/components/Donation/components/CardForm.js
+++ b/client/src/components/Donation/components/CardForm.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Button } from '@freecodecamp/react-bootstrap';
 
@@ -9,7 +9,7 @@ const propTypes = {
   handleSubmit: PropTypes.func.isRequired
 };
 
-class CardForm extends PureComponent {
+class CardForm extends Component {
   constructor(...props) {
     super(...props);
 
diff --git a/client/src/components/Donation/components/DonateForm.js b/client/src/components/Donation/components/DonateForm.js
index 35ab8e38c2..33666a1164 100644
--- a/client/src/components/Donation/components/DonateForm.js
+++ b/client/src/components/Donation/components/DonateForm.js
@@ -1,4 +1,4 @@
-import React, { PureComponent, Fragment } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import isEmail from 'validator/lib/isEmail';
 
@@ -23,7 +23,7 @@ const initialSate = {
   }
 };
 
-class DonateForm extends PureComponent {
+class DonateForm extends Component {
   constructor(...args) {
     super(...args);
     const [props] = args;
diff --git a/client/src/components/Donation/components/StripeCardForm.js b/client/src/components/Donation/components/StripeCardForm.js
index 984bf28ba3..70ca22b56a 100644
--- a/client/src/components/Donation/components/StripeCardForm.js
+++ b/client/src/components/Donation/components/StripeCardForm.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import {
   CardNumberElement,
@@ -17,7 +17,7 @@ const style = {
   }
 };
 
-class StripCardForm extends PureComponent {
+class StripCardForm extends Component {
   constructor(...props) {
     super(...props);
 
diff --git a/client/src/components/Header/components/Login.js b/client/src/components/Header/components/Login.js
index d7392fc0f7..8dad072133 100644
--- a/client/src/components/Header/components/Login.js
+++ b/client/src/components/Header/components/Login.js
@@ -1,30 +1,37 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
 import { Button } from '@freecodecamp/react-bootstrap';
 
-import { hardGoTo } from '../../../redux';
+import { hardGoTo, isSignedInSelector } from '../../../redux';
 import { apiLocation } from '../../../../config/env.json';
 
 import { gtagReportConversion } from '../../../analytics/gtag';
 
 import './login.css';
 
-const mapStateToProps = () => ({});
+const mapStateToProps = createSelector(
+  isSignedInSelector,
+  ({ isSingedIn }) => ({ isSingedIn })
+);
 const mapDispatchToProps = dispatch => ({
   navigate: location => dispatch(hardGoTo(location))
 });
 
-const createOnClick = navigate => e => {
+const createOnClick = (navigate, isSingedIn) => e => {
   e.preventDefault();
   gtagReportConversion();
+  if (isSingedIn) {
+    return navigate('/welcome');
+  }
   return navigate(`${apiLocation}/signin`);
 };
 
 function Login(props) {
-  const { children, navigate, ...restProps } = props;
+  const { children, navigate, isSingedIn, ...restProps } = props;
   return (
-    <a href='/signin' onClick={createOnClick(navigate)}>
+    <a href='/signin' onClick={createOnClick(navigate, isSingedIn)}>
       <Button
         {...restProps}
         bsStyle='default'
@@ -41,6 +48,7 @@ function Login(props) {
 Login.displayName = 'Login';
 Login.propTypes = {
   children: PropTypes.any,
+  isSingedIn: PropTypes.bool,
   navigate: PropTypes.func.isRequired
 };
 
diff --git a/client/src/components/Map/Map.js b/client/src/components/Map/Map.js
index e6a3f107b3..e67608db5d 100644
--- a/client/src/components/Map/Map.js
+++ b/client/src/components/Map/Map.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import uniq from 'lodash/uniq';
 
@@ -21,7 +21,7 @@ const propTypes = {
   nodes: PropTypes.arrayOf(ChallengeNode)
 };
 
-class ShowMap extends PureComponent {
+class ShowMap extends Component {
   renderSuperBlocks(superBlocks) {
     const { nodes, introNodes } = this.props;
     return superBlocks.map(superBlock => (
diff --git a/client/src/components/Map/components/Block.js b/client/src/components/Map/components/Block.js
index c71d6063ba..bb5db5446b 100644
--- a/client/src/components/Map/components/Block.js
+++ b/client/src/components/Map/components/Block.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
@@ -46,7 +46,7 @@ const propTypes = {
 
 const mapIconStyle = { height: '15px', marginRight: '10px', width: '15px' };
 
-export class Block extends PureComponent {
+export class Block extends Component {
   constructor(...props) {
     super(...props);
 
diff --git a/client/src/components/Map/components/SuperBlock.js b/client/src/components/Map/components/SuperBlock.js
index a0efad889d..afcd9b4d3d 100644
--- a/client/src/components/Map/components/SuperBlock.js
+++ b/client/src/components/Map/components/SuperBlock.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
@@ -52,7 +52,7 @@ function createSuperBlockTitle(str) {
     : `${str} Certification (300 hours)`;
 }
 
-export class SuperBlock extends PureComponent {
+export class SuperBlock extends Component {
   renderBlock(superBlock) {
     const { nodes, introNodes } = this.props;
     const blocksForSuperBlock = nodes.filter(
diff --git a/client/src/components/settings/Portfolio.js b/client/src/components/settings/Portfolio.js
index 52cc03b9a0..9a32f98dc8 100644
--- a/client/src/components/settings/Portfolio.js
+++ b/client/src/components/settings/Portfolio.js
@@ -1,4 +1,4 @@
-import React, { PureComponent, Fragment } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import nanoid from 'nanoid';
 import {
@@ -51,7 +51,7 @@ const mockEvent = {
   preventDefault() {}
 };
 
-class PortfolioSettings extends PureComponent {
+class PortfolioSettings extends Component {
   constructor(props) {
     super(props);
 
diff --git a/client/src/contexts/GuideNavigationContext.js b/client/src/contexts/GuideNavigationContext.js
index 14bd9cf72b..fa25bddeab 100644
--- a/client/src/contexts/GuideNavigationContext.js
+++ b/client/src/contexts/GuideNavigationContext.js
@@ -1,4 +1,4 @@
-import React, { PureComponent, createContext } from 'react';
+import React, { Component, createContext } from 'react';
 import PropTypes from 'prop-types';
 
 const noop = () => {};
@@ -19,7 +19,7 @@ const propTypes = {
   children: PropTypes.any
 };
 
-class NavigationContextProvider extends PureComponent {
+class NavigationContextProvider extends Component {
   constructor(...props) {
     super(...props);
 
diff --git a/client/src/templates/Challenges/classic/Editor.js b/client/src/templates/Challenges/classic/Editor.js
index 3781a0463b..144c3fe678 100644
--- a/client/src/templates/Challenges/classic/Editor.js
+++ b/client/src/templates/Challenges/classic/Editor.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
@@ -65,7 +65,7 @@ const defineMonacoThemes = monaco => {
   });
 };
 
-class Editor extends PureComponent {
+class Editor extends Component {
   constructor(...props) {
     super(...props);
 
diff --git a/client/src/templates/Challenges/components/CompletionModal.js b/client/src/templates/Challenges/components/CompletionModal.js
index 1c170e85af..216c09a3a1 100644
--- a/client/src/templates/Challenges/components/CompletionModal.js
+++ b/client/src/templates/Challenges/components/CompletionModal.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import noop from 'lodash/noop';
 import { connect } from 'react-redux';
@@ -59,7 +59,7 @@ const propTypes = {
   title: PropTypes.string
 };
 
-export class CompletionModal extends PureComponent {
+export class CompletionModal extends Component {
   render() {
     const {
       close,
diff --git a/client/src/templates/Challenges/components/HelpModal.js b/client/src/templates/Challenges/components/HelpModal.js
index 317f4009c7..8600097c05 100644
--- a/client/src/templates/Challenges/components/HelpModal.js
+++ b/client/src/templates/Challenges/components/HelpModal.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
@@ -24,7 +24,7 @@ const RSA =
   'https://forum.freecodecamp.org/t/the-read-search-ask-methodology-for-' +
   'getting-unstuck/137307';
 
-export class HelpModal extends PureComponent {
+export class HelpModal extends Component {
   render() {
     const { isOpen, closeHelpModal, createQuestion } = this.props;
     if (isOpen) {
diff --git a/client/src/templates/Challenges/components/Output.js b/client/src/templates/Challenges/components/Output.js
index 9503091e63..df46ff37a4 100644
--- a/client/src/templates/Challenges/components/Output.js
+++ b/client/src/templates/Challenges/components/Output.js
@@ -1,4 +1,4 @@
-import React, { Fragment, PureComponent } from 'react';
+import React, { Fragment, Component } from 'react';
 import PropTypes from 'prop-types';
 import MonacoEditor from 'react-monaco-editor';
 
@@ -24,7 +24,7 @@ const options = {
   }
 };
 
-class Output extends PureComponent {
+class Output extends Component {
   constructor() {
     super();
 
diff --git a/client/src/templates/Challenges/components/Preview.js b/client/src/templates/Challenges/components/Preview.js
index 2084b4ab0b..dfae74a4a6 100644
--- a/client/src/templates/Challenges/components/Preview.js
+++ b/client/src/templates/Challenges/components/Preview.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
 import './preview.css';
@@ -10,7 +10,7 @@ const propTypes = {
   disableIframe: PropTypes.bool
 };
 
-class Preview extends PureComponent {
+class Preview extends Component {
   constructor(...props) {
     super(...props);
 
diff --git a/client/src/templates/Challenges/components/VideoModal.js b/client/src/templates/Challenges/components/VideoModal.js
index b7fa813215..721c79c885 100644
--- a/client/src/templates/Challenges/components/VideoModal.js
+++ b/client/src/templates/Challenges/components/VideoModal.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
@@ -19,7 +19,7 @@ const propTypes = {
   videoUrl: PropTypes.string
 };
 
-export class VideoModal extends PureComponent {
+export class VideoModal extends Component {
   render() {
     const { isOpen, closeVideoModal, videoUrl } = this.props;
     if (isOpen) {
diff --git a/client/src/templates/Challenges/project/ProjectForm.js b/client/src/templates/Challenges/project/ProjectForm.js
index 00fa3b2661..3f497091c5 100644
--- a/client/src/templates/Challenges/project/ProjectForm.js
+++ b/client/src/templates/Challenges/project/ProjectForm.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
 import {
@@ -35,7 +35,7 @@ const options = {
   required: ['solution', 'githubLink']
 };
 
-export class ProjectForm extends PureComponent {
+export class ProjectForm extends Component {
   constructor(props) {
     super(props);
     this.state = {
diff --git a/client/src/templates/Challenges/project/Tool-Panel.js b/client/src/templates/Challenges/project/Tool-Panel.js
index 05729ad3d7..bd4b149692 100644
--- a/client/src/templates/Challenges/project/Tool-Panel.js
+++ b/client/src/templates/Challenges/project/Tool-Panel.js
@@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
@@ -23,7 +23,7 @@ const propTypes = {
   openHelpModal: PropTypes.func.isRequired
 };
 
-export class ToolPanel extends PureComponent {
+export class ToolPanel extends Component {
   render() {
     const { guideUrl, openHelpModal } = this.props;
     return (