diff --git a/domain.module b/domain.module
index da4cbc8..f2b6ab7 100644
--- a/domain.module
+++ b/domain.module
@@ -2938,6 +2938,12 @@ function domain_domain_batch() {
  *
  * If our module changes $conf settings, they may be reflected
  * on admin pages when we don't want them to be.
+ *
+ * @param $form_id
+ *  The form_id of the active form.
+ *
+ * @return
+ *  No return value. Set the proper message to the user.
  */
 function domain_warning_check($form_id) {
   $_warning = &drupal_static(__FUNCTION__);
@@ -2950,9 +2956,6 @@ function domain_warning_check($form_id) {
     drupal_alter('domain_warnings', $forms);
     if ($form_id == 'domain_batch_form' || (arg(2) != 'domain' && in_array($form_id, array_keys($forms)))) {
       $default = domain_default();
-      if ($_domain['domain_id'] == $default['domain_id']) {
-        return;
-      }
       $link_text = '';
       $link = isset($forms[$form_id]) ? $forms[$form_id] : NULL;
       if (!empty($link)) {
@@ -2968,7 +2971,12 @@ function domain_warning_check($form_id) {
         $link_text = t('You may submit changes to the current domain at <a href="!url">%link</a>.', array('!url' => url($link), '%link' => $link));
       }
       $_path = domain_get_uri($default);
-      drupal_set_message(t('This form submits changes to your primary domain and <a href="!url">may need to be entered from !domain</a>. !link', array('#this' => $_domain['subdomain'], '!url' => $_path, '!domain' => $default['subdomain'], '!link' => $link_text)), 'warning', FALSE);
+      $message = '';
+      if ($_domain['domain_id'] != $default['domain_id']) {
+        $message = t(' and <a href="!url">may need to be entered from !domain</a>', array('!url' => $_path, '!domain' => $default['subdomain']));
+      }
+      drupal_set_message(t('This form submits changes to your default
+      configuration!message. !link', array('!message' => $message, '!link' => $link_text)), 'warning', FALSE);
     }
     $_warning = TRUE;
   }
diff --git a/domain_conf/domain_conf.domain.inc b/domain_conf/domain_conf.domain.inc
index 30d5778..377e6db 100644
--- a/domain_conf/domain_conf.domain.inc
+++ b/domain_conf/domain_conf.domain.inc
@@ -23,7 +23,7 @@ function domain_conf_domain_warning() {
   );
   $return = array();
   foreach ($forms as $form) {
-    $return[$form] = 'admin/structure/domain/conf/%domain_id';
+    $return[$form] = 'admin/structure/domain/view/%domain_id/config';
   }
   return $return;
 }
diff --git a/domain_theme/domain_theme.domain.inc b/domain_theme/domain_theme.domain.inc
index 0eb8fdd..55b2f04 100644
--- a/domain_theme/domain_theme.domain.inc
+++ b/domain_theme/domain_theme.domain.inc
@@ -65,12 +65,15 @@ function domain_theme_domain_batch() {
  */
 function domain_theme_domain_warning() {
   $forms =  array(
-    'system_themes_form',
     'system_theme_settings',
   );
   $return = array();
+  $theme = arg(3);
+  if (empty($theme)) {
+    return array();
+  }
   foreach ($forms as $form) {
-    $return[$form] =  'admin/structure/domain/theme/%domain_id';
+    $return[$form] =  'admin/structure/domain/view/%domain_id/theme/' . $theme . '/theme-settings';
   }
   return $return;
 }