diff --git a/CRM/Utils/Check/Component/Env.php b/CRM/Utils/Check/Component/Env.php
index 215d4c0d33b4..9e115b451643 100644
--- a/CRM/Utils/Check/Component/Env.php
+++ b/CRM/Utils/Check/Component/Env.php
@@ -208,14 +208,19 @@ public function checkDomainNameEmail() {
     $messages = array();
 
     list($domainEmailName, $domainEmailAddress) = CRM_Core_BAO_Domain::getNameAndEmail(TRUE);
-    $domain = CRM_Core_BAO_Domain::getDomain();
-    $domainName = $domain->name;
-    $fixEmailUrl = CRM_Utils_System::url("civicrm/admin/domain", "action=update&reset=1");
+    $domain        = CRM_Core_BAO_Domain::getDomain();
+    $domainName    = $domain->name;
+    $fixEmailUrl   = CRM_Utils_System::url("civicrm/admin/options/from_email_address", "&reset=1");
+    $fixDomainName = CRM_Utils_System::url("civicrm/admin/domain", "action=update&reset=1");
 
     if (!$domainEmailAddress || $domainEmailAddress == 'info@EXAMPLE.ORG') {
       if (!$domainName || $domainName == 'Default Domain Name') {
-        $msg = ts("Please enter your organization's <a href=\"%1\">name, primary address, and default FROM Email Address</a> (for system-generated emails).",
-          array(1 => $fixEmailUrl));
+        $msg = ts("Please enter your organization's <a href=\"%1\">name, primary address </a> and <a href=\"%2\">default FROM Email Address </a> (for system-generated emails).",
+          array(
+            1 => $fixDomainName,
+            2 => $fixEmailUrl,
+          )
+        );
       }
       else {
         $msg = ts('Please enter a <a href="%1">default FROM Email Address</a> (for system-generated emails).',
@@ -224,7 +229,7 @@ public function checkDomainNameEmail() {
     }
     elseif (!$domainName || $domainName == 'Default Domain Name') {
       $msg = ts("Please enter your organization's <a href=\"%1\">name and primary address</a>.",
-        array(1 => $fixEmailUrl));
+        array(1 => $fixDomainName));
     }
 
     if (!empty($msg)) {