diff --git a/domain/domain_views/includes/domain_views_handler_field_domain_id.inc b/domain/domain_views/includes/domain_views_handler_field_domain_id.inc
index db35579..3b226d5 100644
--- a/domain/domain_views/includes/domain_views_handler_field_domain_id.inc
+++ b/domain/domain_views/includes/domain_views_handler_field_domain_id.inc
@@ -65,8 +65,13 @@ class domain_views_handler_field_domain_id extends views_handler_field {
     $text = $domain_id;
     $path = $domain['path'];
     if (!empty($this->options['link_to_sitename'])) {
-      $text = $domain['sitename'];
+      return l(($domain_id == DOMAIN_SETTINGS_ALL_DOMAINS) ? t('Active domain') : $domain['sitename'], $path);
     }
-    return l($text, $path);
+
+    if (!empty($this->options['link_to_domain_id'])) {
+      return l($text, $path);      
+    }
+
+    return $text;
   }
-}
+}
\ No newline at end of file