diff --git a/src/components/TaskHeader.js b/src/components/TaskHeader.js
index 4b21d5a2ebe5..4c02cc8b3ab2 100644
--- a/src/components/TaskHeader.js
+++ b/src/components/TaskHeader.js
@@ -2,6 +2,7 @@ import React, {useEffect} from 'react';
 import {View, TouchableOpacity} from 'react-native';
 import PropTypes from 'prop-types';
 import lodashGet from 'lodash/get';
+import _ from 'underscore';
 import reportPropTypes from '../pages/reportPropTypes';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import * as ReportUtils from '../libs/ReportUtils';
@@ -54,7 +55,7 @@ function TaskHeader(props) {
                     >
                         <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.pv3]}>
                             <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                                {props.report.managerEmail && (
+                                {!_.isEmpty(props.report.managerEmail) && (
                                     <>
                                         <Avatar
                                             source={assigneeAvatar}
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 624d0f2a8b65..a875c25359b0 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -76,7 +76,7 @@ class SignInPage extends Component {
         // - AND the login is not the primary login
         // - AND the login is not validated
         const showUnlinkLoginForm =
-            this.props.credentials.login && this.props.account.primaryLogin && this.props.account.primaryLogin !== this.props.credentials.login && !this.props.account.validated;
+            Boolean(this.props.credentials.login && this.props.account.primaryLogin) && this.props.account.primaryLogin !== this.props.credentials.login && !this.props.account.validated;
 
         // Show the old password form if
         // - A login has been entered
@@ -97,7 +97,8 @@ class SignInPage extends Component {
         // - A login has been entered or a validateCode has been cached from sign in link
         // - AND the login isn't an unvalidated secondary login
         // - AND the user is on the 'passwordless' beta
-        const showValidateCodeForm = (this.props.credentials.login || this.props.credentials.validateCode) && !showUnlinkLoginForm && Permissions.canUsePasswordlessLogins(this.props.betas);
+        const showValidateCodeForm =
+            Boolean(this.props.credentials.login || this.props.credentials.validateCode) && !showUnlinkLoginForm && Permissions.canUsePasswordlessLogins(this.props.betas);
 
         // Show the resend validation link form if
         // - A login has been entered