diff --git a/frontends/etiquette_flask/templates/album.html b/frontends/etiquette_flask/templates/album.html
index 556155c..c1f53be 100644
--- a/frontends/etiquette_flask/templates/album.html
+++ b/frontends/etiquette_flask/templates/album.html
@@ -246,7 +246,7 @@ const ALBUM_ID = undefined;
 
                 {% set author = album.get_author() %}
                 {% if author is not none %}
-                <p>Author: <a href="/user/{{author.username}}">{{author.display_name}}</a></p>
+                <p>Author: <a href="/userid/{{author.id}}">{{author.display_name}}</a></p>
                 {% endif %}
 
                 <p>Created on <span title="{{album.created|int|timestamp_to_8601}}">{{album.created|timestamp_to_naturaldate}}.</span></p>
diff --git a/frontends/etiquette_flask/templates/header.html b/frontends/etiquette_flask/templates/header.html
index 54ab064..2490ed5 100644
--- a/frontends/etiquette_flask/templates/header.html
+++ b/frontends/etiquette_flask/templates/header.html
@@ -4,7 +4,7 @@
     <a class="header_element" href="/search">Search</a>
     <a class="header_element" href="/tags">Tags</a>
     {% if session.user %}
-    <a class="header_element dynamic_user_display_name" href="/user/{{session.user.username}}">{{session.user.display_name}}</a>
+    <a class="header_element dynamic_user_display_name" href="/userid/{{session.user.id}}">{{session.user.display_name}}</a>
     <button id="logout_button" class="header_element" onclick="return api.users.logout(common.refresh);" style="flex:0">Logout</button>
     {% else %}
     <a class="header_element" href="/login">Log in</a>
diff --git a/frontends/etiquette_flask/templates/photo.html b/frontends/etiquette_flask/templates/photo.html
index f978a4e..1699fc5 100644
--- a/frontends/etiquette_flask/templates/photo.html
+++ b/frontends/etiquette_flask/templates/photo.html
@@ -178,7 +178,7 @@
         <ul id="metadata">
             {% set author = photo.get_author() %}
             {% if author is not none %}
-                <li>Author: <a href="/user/{{author.username}}">{{author.display_name}}</a></li>
+                <li>Author: <a href="/userid/{{author.id}}">{{author.display_name}}</a></li>
             {% endif %}
             {% if photo.width %}
                 <li title="{{photo.area}} px">Dimensions: {{photo.width}}x{{photo.height}} px</li>
diff --git a/frontends/etiquette_flask/templates/root.html b/frontends/etiquette_flask/templates/root.html
index 07002f5..91a4ff4 100644
--- a/frontends/etiquette_flask/templates/root.html
+++ b/frontends/etiquette_flask/templates/root.html
@@ -73,7 +73,7 @@ body > .nice_link
     <a class="nice_link" href="/albums">Browse albums</a>
     <a class="nice_link" href="/bookmarks">Bookmarks</a>
     {% if session.user %}
-    <a class="nice_link" href="/user/{{session.user.username}}">{{session.user.display_name}}</a>
+    <a class="nice_link" href="/userid/{{session.user.id}}">{{session.user.display_name}}</a>
     {% else %}
     <a class="nice_link" href="/login">Log in</a>
     {% endif %}