diff --git a/_inc/lib/admin-pages/class.jetpack-react-page.php b/_inc/lib/admin-pages/class.jetpack-react-page.php
index 9d3ce44cebea..898087f8944d 100644
--- a/_inc/lib/admin-pages/class.jetpack-react-page.php
+++ b/_inc/lib/admin-pages/class.jetpack-react-page.php
@@ -342,11 +342,20 @@ function get_flattened_settings( $modules ) {
  * @return array
  */
 function jetpack_current_user_data() {
-	$current_user = wp_get_current_user();
+	$current_user   = wp_get_current_user();
 	$is_master_user = $current_user->ID == Jetpack_Options::get_option( 'master_user' );
 	$dotcom_data    = Jetpack::get_connected_user_data();
+
 	// Add connected user gravatar to the returned dotcom_data.
-	$dotcom_data['avatar'] = get_avatar_url( $dotcom_data['email'], array( 'size' => 64, 'default' => 'mysteryman' ) );
+	$dotcom_data['avatar'] = ( ! empty( $dotcom_data['email'] ) ?
+		get_avatar_url(
+			$dotcom_data['email'],
+			array(
+				'size'    => 64,
+				'default' => 'mysteryman',
+			)
+		)
+		: false );
 
 	$current_user_data = array(
 		'isConnected' => Jetpack::is_user_connected( $current_user->ID ),
diff --git a/src/class-tracking.php b/src/class-tracking.php
index c0744de9d501..5f4bf88a18dd 100644
--- a/src/class-tracking.php
+++ b/src/class-tracking.php
@@ -91,8 +91,10 @@ public function jetpack_user_authorized() {
 		}
 
 		$connection_manager = new Connection_Manager();
-		$wpcom_user_data = $connection_manager->get_connected_user_data( $user_id );
-		update_user_meta( $user_id, 'jetpack_tracks_wpcom_id', $wpcom_user_data['ID'] );
+		$wpcom_user_data    = $connection_manager->get_connected_user_data( $user_id );
+		if ( isset( $wpcom_user_data['ID'] ) ) {
+			update_user_meta( $user_id, 'jetpack_tracks_wpcom_id', $wpcom_user_data['ID'] );
+		}
 
 		$this->tracking->record_user_event( 'wpa_user_linked', array() );
 	}