diff --git a/app/assets/javascripts/discourse/components/user-link.js.es6 b/app/assets/javascripts/discourse/components/user-link.js.es6
new file mode 100644
index 00000000000..4c1665fd2ac
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-link.js.es6
@@ -0,0 +1,6 @@
+export default Ember.Component.extend({
+  tagName: 'a',
+  attributeBindings: ['href', 'data-user-card'],
+  href: Ember.computed.alias('user.path'),
+  'data-user-card': Ember.computed.alias('user.username_lower')
+});
diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs
index a0e99d9d4a0..b7e4815b2bc 100644
--- a/app/assets/javascripts/discourse/templates/queued-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs
@@ -3,11 +3,18 @@
     {{#each ctrl in model itemController='queued-post'}}
       <div class='queued-post'>
         <div class='poster'>
-          {{avatar ctrl.post.user imageSize="large"}}
+          {{#user-link user=ctrl.post.user}}
+            {{avatar ctrl.post.user imageSize="large"}}
+          {{/user-link}}
+
         </div>
         <div class='cooked'>
           <div class='names'>
-            <span class='username'>{{ctrl.post.user.username}}</span>
+            <span class="username">
+              {{#user-link user=ctrl.post.user}}
+                {{ctrl.post.user.username}}
+              {{/user-link}}
+            </span>
           </div>
           <div class='clearfix'></div>
 
diff --git a/app/serializers/queued_post_serializer.rb b/app/serializers/queued_post_serializer.rb
index 33b0bccf909..39017c21429 100644
--- a/app/serializers/queued_post_serializer.rb
+++ b/app/serializers/queued_post_serializer.rb
@@ -12,7 +12,7 @@ class QueuedPostSerializer < ApplicationSerializer
              :created_at,
              :category_id
 
-  has_one :user, serializer: BasicUserSerializer, embed: :object
+  has_one :user, serializer: BasicUserSerializer
   has_one :topic, serializer: BasicTopicSerializer
 
   def category_id