diff --git a/public/app.js b/public/app.js
index 5e67d88b950a1453653929400503dec0b27afe92..7b88dcd65cc5d0cb7668f60d20724334162f4f2c 100644
--- a/public/app.js
+++ b/public/app.js
@@ -1127,23 +1127,17 @@ module.exports = function ($scope, Webmin, heads, info, conf, ws) {
         var software = sp[6];
         var softVersion = sp[7];
         var prefix = sp[8];
-        var freeRooms = ""
         var uid = value.uid;
-        // Gestion des différents formats
+        // Gestion de l'ancien format
         console.log(value.message);
-        if (value.message.match(/:2:/)) {
-          // HEAD v2
-          freeRooms= sp[9] + "/" + sp[10];
-        } else if (value.message.match(/:1:/)) {
-          // HEAD v1
-        } else {
-          // HEAD v0
+        if (!value.message.match(/:1:/)) {
           pubkey = sp[2];
           blockstamp = sp[3];
+          uid = value.uid;
         }
         var ws2pFullId = pubkey + "-" + ws2pId;
         headsMap[ws2pFullId] = {
-          api: api, blockstamp: blockstamp, uid: uid, ws2pId: ws2pId, software: software, softVersion: softVersion, prefix: prefix, freeRooms: freeRooms
+          api: api, blockstamp: blockstamp, uid: uid, ws2pId: ws2pId, software: software, softVersion: softVersion, prefix: prefix
         };
       }
     } catch (err) {
diff --git a/server/controller/webmin.js b/server/controller/webmin.js
index bc1c91ca4f43f6871342582332d0b341f05e9150..233b6f7d521a17c8a86e6af0cfa621faeb8eaad3 100644
--- a/server/controller/webmin.js
+++ b/server/controller/webmin.js
@@ -654,16 +654,19 @@ function WebAdmin (duniterServer, startServices, stopServices, listDuniterUIPlug
     if (server.ws2pCluster) {
       const heads = yield server.ws2pCluster.getKnownHeads()
       for (const head of heads) {
+        const headInfos = head.message.split(':')
         let posPubkey = 3;
-        // Gestion des anciens formats
-        if (!head.message.match(/:2:/)) {
-          posPubkey = 3;
-          if (!head.message.match(/:1:/)) {
-            posPubkey = 2;
-          }
+        // Gestion des différents formats
+        if (head.message.match(/:2:/)) {
+          //HEAD v2
+          head.freeRooms = headInfos[9] + "/" + headInfos[10]
+        } else if (head.message.match(/:1:/)) {
+          // HEAD V1
+        } else {
+          // HEAD V0
+          posPubkey = 2;
         }
-        
-        const member = yield duniterServer.dal.getWrittenIdtyByPubkey(head.message.split(':')[posPubkey])
+        const member = yield duniterServer.dal.getWrittenIdtyByPubkey(headInfos[posPubkey])
         head.uid = member && member.uid || ''
       }
       return heads
diff --git a/server/lib/routes.js b/server/lib/routes.js
index c08d0b0862695e6b081e3077074306cb43332780..981576e17f55dca06bcba7ecb12731104f2b3a97 100644
--- a/server/lib/routes.js
+++ b/server/lib/routes.js
@@ -156,16 +156,18 @@ module.exports = {
                       co(function*() {
                         if (data.ws2p === 'heads') {
                           for (const head of data.added) {
+                            const headInfos = head.message.split(':')
                             let posPubkey = 3;
-                            // Gestion des anciens formats
-                            if (!head.message.match(/:2:/)) {
+                            // Gestion des différents formats
+                            if (head.message.match(/:2:/)) {
+                                head.freeRooms = headInfos[9] + "/" + headInfos[10]
+                            } else if (head.message.match(/:1:/)) {
                                 posPubkey = 3;
-                                if (!head.message.match(/:1:/)) {
-                                    posPubkey = 2;
-                                }
+                            } else {
+                                posPubkey = 2;
                             }
                             
-                            const member = yield server.dal.getWrittenIdtyByPubkey(head.message.split(':')[posPubkey])
+                            const member = yield server.dal.getWrittenIdtyByPubkey(headInfos[posPubkey])
                             head.uid = member && member.uid || ''
                           }
                           wssEvents.broadcast(JSON.stringify({