diff --git a/templates/index.html b/templates/index.html
index 1aaf350..97af6a7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -154,6 +154,7 @@ <h1>ADSB.lol is the first entirely Open Source flight tracker.</h1>
         <h3>
             <a href="https://globe.adsb.lol/">Globe (Map)</a> &#12316;
             <a href="https://adsb.lol/stats">Statistics</a> &#12316;
+            <a href="https://matrix.to/#/#adsblol:gatto.club">Matrix</a> &#12316;
             <a href="https://adsb.lol/discord">Discord</a> &#12316;
             <a href="https://api.adsb.lol">API</a> &#12316;
             <a href="https://map.adsb.lol">MLAT Feeder Map</a>
@@ -168,8 +169,8 @@ <h3>Check from terminal with <code>curl https://adsb.lol/api/0/me</code></h3>
             <li>MLAT: <code>feed.adsb.lol</code> port <code>1338</code> or port <code>31090</code>
             <li>
                 <p><b>To start feeding</b>, see <a href="https://github.com/adsblol/feed">the adsb.lol feed client</a>.
-                 
-              
+
+
         </ul>
 
         {% set own_beast = clients_beast|length %}
@@ -198,7 +199,12 @@ <h3>Feeding from the following clients:</h2>
                     <th>Positions/s</th>
                     {% for client in clients_beast %}
                 <tr>
+                    <!--- If client[0] ends with 000000000000, show a warning! The UUID has not been set. -->
+                    {% if client[0] | endswith("000000000000") %}
+                    <td style="color: red">NO UUID! Please run <code>adsblol-update && adsblol-up</code><br/>or set one in your existing client.</td>
+                    {% else %}
                     <td>{{ client[0] }}</td>
+                    {% endif %}
                     <td>{{ client[1] }}</td>
                     <td>{{ client[2] }}</td>
                     <td>{{ client[3] }}</td>