diff --git a/src/snek/templates/message.html b/src/snek/templates/message.html
index e38d662..df78d9a 100644
--- a/src/snek/templates/message.html
+++ b/src/snek/templates/message.html
@@ -1 +1 @@
-<div style="max-width:100%;" data-uid="{{uid}}" data-color="{{color}}" data-channel_uid="{{channel_uid}}" data-user_nick="{{user_nick}}" data-created_at="{{created_at}}" data-user_uid="{{user_uid}}" class="message"><div class="avatar" style="background-color: {{color}}; color: black;"><a href="/user/{{user_uid}}.html"><img width="40px" height="40px" src="/avatar/{{user_uid}}.svg" /></a></div><div class="message-content"><div class="author" style="color: {{color}};">{{user_nick}}</div><div class="text">{% autoescape false %}{% emoji %}{% linkify %}{% markdown %}{% autoescape false %}{{ message }}{%raw %} {% endraw%}{%endautoescape%}{% endmarkdown %}{% endlinkify %}{% endemoji %}{% endautoescape %}</div><div class="time no-select" data-created_at="{{created_at}}"></div></div></div>
+<div style="max-width:100%;" data-uid="{{uid}}" data-color="{{color}}" data-channel_uid="{{channel_uid}}" data-user_nick="{{user_nick}}" data-created_at="{{created_at}}" data-user_uid="{{user_uid}}" class="message"><a class="avatar" style="background-color: {{color}}; color: black;" href="/user/{{user_uid}}.html"><img width="40px" height="40px" src="/avatar/{{user_uid}}.svg" /></a><div class="message-content"><div class="author" style="color: {{color}};">{{user_nick}}</div><div class="text">{% autoescape false %}{% emoji %}{% linkify %}{% markdown %}{% autoescape false %}{{ message }}{%raw %} {% endraw%}{%endautoescape%}{% endmarkdown %}{% endlinkify %}{% endemoji %}{% endautoescape %}</div><div class="time no-select" data-created_at="{{created_at}}"></div></div></div>
diff --git a/src/snek/view/user.py b/src/snek/view/user.py
index bb25180..d29b8f3 100644
--- a/src/snek/view/user.py
+++ b/src/snek/view/user.py
@@ -4,9 +4,11 @@ from snek.system.view import BaseView
 class UserView(BaseView):
     
     async def get(self):
-        user = self.request['user']
+        user_uid = self.request.match_info.get('user')
+        user = await self.services.user.get(uid=user_uid)
         profile_content = await self.services.user_property.get(user['uid'],'profile') or ''
         return await self.render_template('user.html', {
+            'user_uid': user_uid,
             'user': user.record,
             'profile': profile_content  
         })