diff --git a/Netdisco/Changes b/Netdisco/Changes
index 6fd3b2c4..756c07f3 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -2,7 +2,8 @@
 
   [BUG FIXES]
 
-  * No longer prompt for demo/demo credentials (closes #38)
+  * No longer prompt for demo/demo credentials (closes #38) (J. Binks)
+  * Display IP in Vlan search if device has no DNS (closes #36) (J. Binks)
 
 2.004000 - 2013-01-14
 
diff --git a/Netdisco/share/views/ajax/search/vlan.tt b/Netdisco/share/views/ajax/search/vlan.tt
index e5d7fe57..511aa0b3 100644
--- a/Netdisco/share/views/ajax/search/vlan.tt
+++ b/Netdisco/share/views/ajax/search/vlan.tt
@@ -15,7 +15,7 @@
       <td><a class="nd_linkcell nd_stealthlink"
         href="[% vars.device_ports %]&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.vlan.vlan %]</a></td>
       <td><a class="nd_linkcell"
-        href="[% vars.device_ports %]&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.dns %]</a></td>
+        href="[% vars.device_ports %]&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.dns.remove(settings.domain_suffix) || row.ip %]</a></td>
       <td><a class="nd_linkcell nd_stealthlink"
         href="[% vars.device_ports %]&q=[% row.ip %]&f=[% row.vlan.vlan %]">[% row.vlan.description %]</a></td>
       <td><a class="nd_linkcell nd_stealthlink"