diff --git a/src/js/common/components/Settings/SettingsVerifySecretCode.jsx b/src/js/common/components/Settings/SettingsVerifySecretCode.jsx
index 7db254652..83654d6b6 100644
--- a/src/js/common/components/Settings/SettingsVerifySecretCode.jsx
+++ b/src/js/common/components/Settings/SettingsVerifySecretCode.jsx
@@ -535,9 +535,15 @@ class SettingsVerifySecretCode extends Component {
             <Title condensed={condensed}>Code Verification</Title>
             <Subtitle>A 6-digit code has been sent to</Subtitle>
             <PhoneSubtitle>{voterPhoneNumber || voterEmailAddress}</PhoneSubtitle>
-            <Subtitle>If you haven't received the code within 30 seconds, please verify the number you entered.</Subtitle>
-            {(voterEmailAddress) && (
+
+            {(voterEmailAddress) ? (
               <Subtitle>If you haven&apos;t received the code in 30 seconds, please check your spam folder and mark the email as &apos;Not Spam&apos;.</Subtitle>
+            ) : (
+              <>
+                {(voterPhoneNumber) && (
+                  <Subtitle>If you haven&apos;t received the code within 30 seconds, please verify the number you entered.</Subtitle>
+                )}
+              </>
             )}
             <InputContainer condensed={condensed}>
               <OutlinedInput
diff --git a/src/js/pages/Friends/FindFriendsRoot.jsx b/src/js/pages/Friends/FindFriendsRoot.jsx
index 59c22a130..852413351 100644
--- a/src/js/pages/Friends/FindFriendsRoot.jsx
+++ b/src/js/pages/Friends/FindFriendsRoot.jsx
@@ -87,9 +87,6 @@ class FindFriendsRoot extends React.Component {
     this.setState({
       displayStep,
       setUpPagePath,
-    }, () => {
-      //Paul added this to set the next step variables like componentDidUpdate
-        this.setNextStepVariables();
     });
     // this.onBallotStoreChange();
     // this.ballotStoreListener = BallotStore.addListener(this.onBallotStoreChange.bind(this));
@@ -139,9 +136,7 @@ class FindFriendsRoot extends React.Component {
       this.setState({
         displayStep,
         setUpPagePath,
-      }, () => {
-        this.setNextStepVariables();    
-      });
+      }, () => this.setNextStepVariables());
     } else if ((setUpPagePath === 'importcontacts') && (voterContactEmailListCount > 0 && (voterContactEmailListCountPrevious !== voterContactEmailListCount))) {
       // console.log('Leaving importcontacts step');
       this.resetNextButtonClicked();
@@ -259,7 +254,6 @@ class FindFriendsRoot extends React.Component {
 
   goToNextStep = () => {
     this.resetNextButtonClicked();
-
     const { nextStepPath } = this.state;
     // console.log('FindFriendsRoot goToNextStep nextStepPath:', nextStepPath);
     if (nextStepPath) {
@@ -342,7 +336,6 @@ class FindFriendsRoot extends React.Component {
           } else {
             skipForNowPath = '/ready';
           }
-
         } else if (friendConnectionActionAvailable) {
           nextButtonText = 'Next';
           nextStepPath = '/findfriends/friendrequests';
@@ -356,8 +349,6 @@ class FindFriendsRoot extends React.Component {
           nextStepPath = '/ready';
           skipForNowPath = '/ready';
         }
-        console.log('setNextStepVariables [Condition1]: backButtonOn changing to', backButtonOn);
-
         break;
       case 2: // signin
         // console.log('setUpAccountEntryPath:', setUpAccountEntryPath, ', setUpAccountBackLinkPath:', setUpAccountBackLinkPath);
@@ -423,10 +414,8 @@ class FindFriendsRoot extends React.Component {
           skipForNowPath = '/ready';
         }
         editNameStepVisited = true;
-
         break;
       case 4: // 'addphoto'
-
       case 5:
         backButtonOn = true;
         desktopFixedButtonsOn = false;
@@ -479,7 +468,6 @@ class FindFriendsRoot extends React.Component {
         }
         addPhotoStepVisited = true;
         break;
-
       case 6: // invitecontacts
         backButtonOn = true;
         desktopFixedButtonsOn = true;
@@ -508,7 +496,6 @@ class FindFriendsRoot extends React.Component {
           skipForNowPath = '/ready';
         }
         break;
-
       case 7: // friendrequests
         backButtonOn = true;
         desktopFixedButtonsOn = true;
@@ -528,7 +515,6 @@ class FindFriendsRoot extends React.Component {
         skipForNowPath = '/ready';
         reassuranceTextOff = true;
         break;
-
     }
     this.setState({
       addPhotoStepVisited,