diff --git a/CHANGES.txt b/CHANGES.txt
index deb2f4b76e9..aecec8a3929 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -218,6 +218,8 @@ Release 0.20.0 - Unreleased
                not reassigned
    HBASE-1568  Client doesnt consult old row filter interface in
                filterSaysStop() - could result in NPE or excessive scanning
+   HBASE-1564  in UI make host addresses all look the same -- not IP sometimes
+               and host at others
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage
diff --git a/src/webapps/master/master.jsp b/src/webapps/master/master.jsp
index d857fa311b6..e85d3ebdc8e 100644
--- a/src/webapps/master/master.jsp
+++ b/src/webapps/master/master.jsp
@@ -147,7 +147,7 @@ $(document).ready(function(){
      Arrays.sort(serverNames);
      for (String serverName: serverNames) {
        HServerInfo hsi = serverToServerInfos.get(serverName);
-       String hostname = hsi.getServerAddress().getInetSocketAddress().getAddress().getHostAddress() + ":" + hsi.getInfoPort();
+       String hostname = hsi.getServerAddress().getHostname() + ":" + hsi.getInfoPort();
        String url = "http://" + hostname + "/";
        totalRegions += hsi.getLoad().getNumberOfRegions();
        totalRequests += hsi.getLoad().getNumberOfRequests() / interval;
diff --git a/src/webapps/master/table.jsp b/src/webapps/master/table.jsp
index 291013bf6b1..26695657d33 100644
--- a/src/webapps/master/table.jsp
+++ b/src/webapps/master/table.jsp
@@ -110,7 +110,7 @@
 %>
 <tr>
   <td><%= Bytes.toString(meta.getRegionName()) %></td>
-    <td><a href="<%= url %>"><%= meta.getServer().toString() %></a></td>
+    <td><a href="<%= url %>"><%= meta.getServer().getHostname().toString() + ":" + infoPort %></a></td>
     <td>-</td><td><%= Bytes.toString(meta.getStartKey()) %></td><td>-</td>
 </tr>
 <%  } %>
@@ -141,7 +141,7 @@
 %>
 <tr>
   <td><a href="<%= urlRegionHistorian %>"><%= Bytes.toStringBinary(hriEntry.getKey().getRegionName())%></a></td>
-  <td><a href="<%= urlRegionServer %>"><%= hriEntry.getValue().toString() %></a></td>
+  <td><a href="<%= urlRegionServer %>"><%= hriEntry.getValue().getHostname().toString() + ":" + infoPort %></a></td>
   <td><%= hriEntry.getKey().getEncodedName()%></td> <td><%= Bytes.toStringBinary(hriEntry.getKey().getStartKey())%></td>
   <td><%= Bytes.toStringBinary(hriEntry.getKey().getEndKey())%></td>
 </tr>