diff --git a/static/admin.html b/static/admin.html
index 48cd228..902f0ed 100644
--- a/static/admin.html
+++ b/static/admin.html
@@ -67,6 +67,9 @@
         </div>
 
 	    <input id="popup"/><button id="sendPopup">Send popup to all clients</button><br/>
+        <br/>
+        <a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=20px /></a><br/>
+        <span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
     </div>
 
 	<script type="text/javascript">
diff --git a/static/dgnum-logo.png b/static/dgnum-logo.png
new file mode 100644
index 0000000..9c9fe1c
Binary files /dev/null and b/static/dgnum-logo.png differ
diff --git a/static/tracking/conscrit.html b/static/tracking/conscrit.html
index 64d8127..b13c23f 100644
--- a/static/tracking/conscrit.html
+++ b/static/tracking/conscrit.html
@@ -33,6 +33,10 @@
 	<div id="map"></div><br/>
 
 	<div id="codes"></div>
+	<div id="thanks">
+        <a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=20px /></a><br/>
+        <span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
+    </div>
 
 	<script type="text/javascript">
 		//////////////////////////////////////////////////////////////////////////////
diff --git a/static/tracking/invalid.html b/static/tracking/invalid.html
index e7faa4b..0b8f5d5 100644
--- a/static/tracking/invalid.html
+++ b/static/tracking/invalid.html
@@ -8,5 +8,9 @@
 <body>
     <h1> Équipe %ID inconnue ! </h1>
     Utilise bien les urls qu'on te donne petit conscrit.
+
+    <br/><br/>
+    <a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=20px /></a><br/>
+    <span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
 </body>
 </html>
diff --git a/static/tracking/vieux.html b/static/tracking/vieux.html
index 2a87f3b..81c4e88 100644
--- a/static/tracking/vieux.html
+++ b/static/tracking/vieux.html
@@ -60,7 +60,11 @@
             <label for="npc8"><img src="/icons/10.png" height=15px></label>
             <input type="radio" id="npc9" name="npc" value=9 checked onclick='sendState()' />
             <label for="npc9"><img src="/icons/11.png" height=15px></label>
-        </form>
+        </form><br/>
+        
+        <br/>
+        <a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=20px /></a><br/>
+        <span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
 	</div>
 
 	<script type="text/javascript">
diff --git a/traque.js b/traque.js
index f714a9b..6d787af 100644
--- a/traque.js
+++ b/traque.js
@@ -267,7 +267,7 @@ function send_update(team){
       else if(team.state.mallette)
         io.to(team.id).emit('moving', apparent_info_mallette(equipes[other_id]));
       else if(team.state.npc != 0)
-        io.to(team.id).emit('moving', {"id": team_id, "color": admin_color(equipe), "position": equipe.pos});
+        io.to(team.id).emit('moving', {"id": other_id, "color": admin_color(equipes[other_id]), "position": equipes[other_id].pos});
       else
         io.to(team.id).emit('moving', apparent_info_agent(equipes[other_id]));
     }
@@ -284,7 +284,7 @@ function team_join(team, socket){
             else if(team.state.mallette)
                 socket.emit('moving', apparent_info_mallette(equipes[other_id]));
             else if(team.state.npc != 0)
-                socket.emit('moving', {"id": team_id, "color": admin_color(equipe), "position": equipe.pos});
+                socket.emit('moving', {"id": other_id, "color": admin_color(equipes[other_id]), "position": equipes[other_id].pos});
             else
                 socket.emit('moving', apparent_info_agent(equipes[other_id]));
         }
