diff --git a/www/app/templates/blocks/block.hbs b/www/app/templates/blocks/block.hbs
index 791d070..3945c25 100644
--- a/www/app/templates/blocks/block.hbs
+++ b/www/app/templates/blocks/block.hbs
@@ -8,11 +8,11 @@
   </td>
   <td>
     {{#if block.uncle}}
-      <a href="https://expedition.dev/uncle/{{block.login}}" class="hash" rel="nofollow" target="_blank">{{block.login}}</a>
+      <td>{{#link-to 'account' block.login class='hash'}}{{block.login}}{{/link-to}}</td>
     {{else if block.orphan}}
       <span class="label label-danger">Orphan</span>
     {{else}}
-      <a href="https://expedition.dev/block/{{block.login}}" class="hash" rel="nofollow" target="_blank">{{block.login}}</a>
+      <td>{{#link-to 'account' block.login class='hash'}}{{block.login}}{{/link-to}}</td>
     {{/if}}
   </td>
   <td>{{format-date-locale block.timestamp}}</td>