diff --git a/src/page-admin-circles.pug b/src/page-admin-circles.pug
index 2b302d4..5d2bf04 100644
--- a/src/page-admin-circles.pug
+++ b/src/page-admin-circles.pug
@@ -33,7 +33,7 @@
           set-user-id-select="user"
         )
 
-    include hd-user-avatar.pug
+    include templates/hd-user-avatar.pug
 
     div.content-box__info
       sib-link(class="right-btn", next="admin-circle-create") Create a new circle
diff --git a/src/scripts/index.js b/src/scripts/index.js
index edb1ecc..0e786f7 100644
--- a/src/scripts/index.js
+++ b/src/scripts/index.js
@@ -47,7 +47,7 @@ document.addEventListener('DOMContentLoaded', function (event) {
       for(sibForm of document.querySelectorAll('[set-user-id-select]')) {
         sibForm.addEventListener('populate', () => {
           document.querySelectorAll('sib-form[submit-button^="Join"]').forEach(el=>el.style.display = 'none');
-          if(document.querySelectorAll('sib-ac-checker:not([hidden]) > sib-delete[data-label="^Leave"]').length == 0) {
+          if(document.querySelectorAll('sib-ac-checker:not([hidden]) > sib-delete[data-label^="Leave"]').length == 0) {
             document.querySelectorAll('sib-form[submit-button^="Join"]').forEach(el=>el.style.display = 'inline-block');
           }
           // BUG: Populate event trigger before the view is fully loaded! - https://git.happy-dev.fr/startinblox/framework/sib-core/issues/521