diff --git a/includes/wc-account-functions.php b/includes/wc-account-functions.php
index 07a30b313f9..b5b3591b353 100644
--- a/includes/wc-account-functions.php
+++ b/includes/wc-account-functions.php
@@ -95,11 +95,16 @@ function wc_get_account_menu_items() {
 		'customer-logout' => get_option( 'woocommerce_logout_endpoint', 'customer-logout' ),
 	);
 
+	$edit_address = __( 'Address', 'woocommerce' );
+	if ( get_option( 'woocommerce_ship_to_countries' ) !== 'disabled' ) {
+		$edit_address = __( 'Addresses', 'woocommerce' );
+	}
+
 	$items = array(
 		'dashboard'       => __( 'Dashboard', 'woocommerce' ),
 		'orders'          => __( 'Orders', 'woocommerce' ),
 		'downloads'       => __( 'Downloads', 'woocommerce' ),
-		'edit-address'    => __( 'Addresses', 'woocommerce' ),
+		'edit-address'    => $edit_address,
 		'payment-methods' => __( 'Payment methods', 'woocommerce' ),
 		'edit-account'    => __( 'Account details', 'woocommerce' ),
 		'customer-logout' => __( 'Logout', 'woocommerce' ),
diff --git a/templates/myaccount/dashboard.php b/templates/myaccount/dashboard.php
index bb55b7c0683..a69bcc128d0 100644
--- a/templates/myaccount/dashboard.php
+++ b/templates/myaccount/dashboard.php
@@ -35,8 +35,12 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 <p>
 	<?php
+	$dashboard_desc = __( 'From your account dashboard you can view your <a href="%1$s">recent orders</a>, manage your <a href="%2$s">billing address</a>, and <a href="%3$s">edit your password and account details</a>.', 'woocommerce' );
+	if ( get_option( 'woocommerce_ship_to_countries' ) !== 'disabled' ) {
+		$dashboard_desc = __( 'From your account dashboard you can view your <a href="%1$s">recent orders</a>, manage your <a href="%2$s">shipping and billing addresses</a>, and <a href="%3$s">edit your password and account details</a>.', 'woocommerce' );
+	}
 	printf(
-		__( 'From your account dashboard you can view your <a href="%1$s">recent orders</a>, manage your <a href="%2$s">shipping and billing addresses</a>, and <a href="%3$s">edit your password and account details</a>.', 'woocommerce' ),
+		$dashboard_desc,
 		esc_url( wc_get_endpoint_url( 'orders' ) ),
 		esc_url( wc_get_endpoint_url( 'edit-address' ) ),
 		esc_url( wc_get_endpoint_url( 'edit-account' ) )