diff --git a/domain.module b/domain.module
index 2d49d23..7b63c71 100644
--- a/domain.module
+++ b/domain.module
@@ -3097,6 +3097,9 @@ function domain_warning_check($form_id) {
       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']));
       }
+      else {
+        $link_text = '';
+      }
       drupal_set_message(t('This form submits changes to your default
       configuration!message. !link', array('!message' => $message, '!link' => $link_text)), 'warning', FALSE);
     }
diff --git a/domain_conf/domain_conf.domain.inc b/domain_conf/domain_conf.domain.inc
index faca7d7..8ccc98c 100644
--- a/domain_conf/domain_conf.domain.inc
+++ b/domain_conf/domain_conf.domain.inc
@@ -20,6 +20,7 @@ function domain_conf_domain_warning() {
     'system_site_maintenance_mode',
     'locale_languages_overview_form',
     'menu_configure',
+    'node_type_form',
   );
   $return = array();
   foreach ($forms as $form) {