diff --git a/src/templates/tweets.mustache b/src/templates/tweets.mustache
index 7b329c4..7bd4815 100644
--- a/src/templates/tweets.mustache
+++ b/src/templates/tweets.mustache
@@ -6,7 +6,7 @@
 
 {{# tweets }}
   <div class="entries">
-    <a href="/users/{{ username }}/0">{{ username }}</a> - {{ time }}
+    <a href="/users/{{ username }}/0">@{{ username }}</a> - {{ time }}
     <p>{{ tweet }}</p>
     <small><a href="/tweet/{{ permalink }}">permalink</a></small>
   </div>
diff --git a/src/templates/users.mustache b/src/templates/users.mustache
index ebaac3e..1170c33 100644
--- a/src/templates/users.mustache
+++ b/src/templates/users.mustache
@@ -1,5 +1,5 @@
 <ul>
   {{# users }}
-    <li><a href="/users/{{ username }}/0">{{ username }}</a> <a href="{{ url }}">feed</a></li>
+    <li><a href="/users/{{ username }}/0">@{{ username }}</a> <a href="{{ url }}">feed</a></li>
   {{/ users }}
 </ul>