diff --git a/r2/r2/templates/comment.mobile b/r2/r2/templates/comment.mobile
index 6a2edb76d..111f6e857 100644
--- a/r2/r2/templates/comment.mobile
+++ b/r2/r2/templates/comment.mobile
@@ -48,22 +48,7 @@
 %else:
 
 <p class="byline">
-  <%
-       author = thing.author
-       if WrappedUser(author).has_flair and WrappedUser(author).flair_enabled:
-          flair = WrappedUser(author).flair_text
-          flair_left = WrappedUser(author).flair_position == 'left'
-       else:
-          flair = False
-  %>
-  %if flair and flair_left:
-    <span class="flair">${flair}</span>
-  %endif
-  <a href="/user/${thing.author.name}">
-      <b>${thing.author.name}</b></a>
-  %if flair and not flair_left:
-    <span class="flair">${flair}</span>
-  %endif
+  ${WrappedUser(thing.author, thing.attribs, thing, gray = collapse).render()}
   &nbsp;|<span class="score">${thing.score} ${ungettext("point", "points", thing.score)} </span> 
   ${_("written")} ${thing.timesince} ${_("ago")}
 </p>
diff --git a/r2/r2/templates/printable.mobile b/r2/r2/templates/printable.mobile
index 4ddae9409..3d377a422 100644
--- a/r2/r2/templates/printable.mobile
+++ b/r2/r2/templates/printable.mobile
@@ -59,19 +59,8 @@
        name = websafe(author.name)
        href = unsafe('href="/user/%s.mobile"' % name)
        if c.user_is_admin: name += " (%d)" % (author.link_karma)
-       if WrappedUser(author).has_flair and WrappedUser(author).flair_enabled:
-          flair = WrappedUser(author).flair_text
-          flair_left = WrappedUser(author).flair_position == 'left'
-       else:
-          flair = False
     %>
-  %if flair and flair_left:
-    <span class="flair">${flair}</span>
-  %endif
-    <a class="${author_cls}" ${href}>${name}</a>
-  %if flair and not flair_left:
-    <span class="flair">${flair}</span>
-  %endif
+  ${WrappedUser(thing.author, thing.attribs, thing, gray = collapse).render()}
  %endif
 </%def>
 
diff --git a/r2/r2/templates/wrappeduser.mobile b/r2/r2/templates/wrappeduser.mobile
new file mode 100644
index 000000000..55dbd9c19
--- /dev/null
+++ b/r2/r2/templates/wrappeduser.mobile
@@ -0,0 +1,37 @@
+## The contents of this file are subject to the Common Public Attribution
+## License Version 1.0. (the "License"); you may not use this file except in
+## compliance with the License. You may obtain a copy of the License at
+## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+## License Version 1.1, but Sections 14 and 15 have been added to cover use of
+## software over a computer network and provide for limited attribution for the
+## Original Developer. In addition, Exhibit A has been modified to be consistent
+## with Exhibit B.
+##
+## Software distributed under the License is distributed on an "AS IS" basis,
+## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+## the specific language governing rights and limitations under the License.
+##
+## The Original Code is Reddit.
+##
+## The Original Developer is the Initial Developer.  The Initial Developer of
+## the Original Code is CondeNet, Inc.
+##
+## All portions of the code written by CondeNet are Copyright (c) 2006-2010
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+<%
+if thing.has_flair and thing.flair_enabled:
+  flair = thing.flair_text
+  flair_left = thing.flair_position == 'left'
+else:
+  flair = False
+%>
+
+%if flair and flair_left:
+<span class="flair">${flair}</span>
+%endif
+<a href="/user/${thing.name}">0<
+<b>${thing.name}</b></a>
+%if flair and not flair_left:
+<span class="flair">${flair}</span>
+%endif