diff --git a/modules/about/client/views/maker-view.client.view.html b/modules/about/client/views/maker-view.client.view.html
index 2da8205a..4920db60 100644
--- a/modules/about/client/views/maker-view.client.view.html
+++ b/modules/about/client/views/maker-view.client.view.html
@@ -183,8 +183,6 @@
                                         <div class="media-body">
                                             <h5 class="media-heading">
                                                 <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                                <span class="upload-by" ng-show="item.user.displayName"> (By:
-                                                <span user-info="item.user" info-name></span> )</span>
                                             </h5>
 
                                             <div class="list-all-genres">
diff --git a/modules/collections/client/views/collection-view.client.view.html b/modules/collections/client/views/collection-view.client.view.html
index c043c6bf..00e77582 100644
--- a/modules/collections/client/views/collection-view.client.view.html
+++ b/modules/collections/client/views/collection-view.client.view.html
@@ -115,8 +115,6 @@
                                         <div class="media-body">
                                             <h5 class="media-heading">
                                                 <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                                <span class="upload-by" ng-show="item.user.displayName"> (By:
-                                                <span user-info="item.user" info-name></span> )</span>
                                             </h5>
 
                                             <div class="list-all-genres">
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index f9c3babf..efeec9f0 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -204,8 +204,6 @@
                                 <div class="media-body">
                                     <h5 class="media-heading">
                                         <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                        <span class="upload-by" ng-show="item.user.displayName"> (By:
-                                            <span user-info="item.user" info-name></span> )</span>
                                     </h5>
 
                                     <div class="list-all-genres">
diff --git a/modules/torrents/server/controllers/peers.server.controller.js b/modules/torrents/server/controllers/peers.server.controller.js
index da02c8b7..1975a303 100644
--- a/modules/torrents/server/controllers/peers.server.controller.js
+++ b/modules/torrents/server/controllers/peers.server.controller.js
@@ -30,10 +30,10 @@ exports.getMySeeding = function (req, res) {
   }).sort('-peer_uploaded')
     .populate({
       path: 'torrent',
-      populate: {
-        path: 'user',
-        select: 'displayName profileImageURL'
-      }
+      populate: [
+        {path: 'user', select: 'displayName profileImageURL'},
+        {path: 'maker', select: 'name'}
+      ]
     })
     .exec(function (err, torrents) {
       if (err) {
@@ -58,10 +58,10 @@ exports.getMyDownloading = function (req, res) {
   }).sort('-peer_downloaded')
     .populate({
       path: 'torrent',
-      populate: {
-        path: 'user',
-        select: 'displayName profileImageURL'
-      }
+      populate: [
+        {path: 'user', select: 'displayName profileImageURL'},
+        {path: 'maker', select: 'name'}
+      ]
     })
     .exec(function (err, torrents) {
       if (err) {
@@ -85,10 +85,10 @@ exports.getMyWarning = function (req, res) {
     hnr_warning: true
   }).populate({
     path: 'torrent',
-    populate: {
-      path: 'user',
-      select: 'displayName profileImageURL'
-    }
+    populate: [
+      {path: 'user', select: 'displayName profileImageURL'},
+      {path: 'maker', select: 'name'}
+    ]
   }).exec(function (err, complets) {
     if (err) {
       return res.status(422).send({
diff --git a/modules/users/client/views/admin/user-leeching.client.view.html b/modules/users/client/views/admin/user-leeching.client.view.html
index e0aff757..7690ccc1 100644
--- a/modules/users/client/views/admin/user-leeching.client.view.html
+++ b/modules/users/client/views/admin/user-leeching.client.view.html
@@ -65,7 +65,8 @@
                                         <h5 class="media-heading">
                                             <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
                                             <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                                <span user-info="item.torrent.user" info-name></span> )</span>
+                                                <span user-info="item.torrent.user" info-name></span> <span
+                                                        maker-info="item.torrent.maker"></span>)</span>
                                         </h5>
 
                                         <div class="list-all-genres">
diff --git a/modules/users/client/views/admin/user-seeding.client.view.html b/modules/users/client/views/admin/user-seeding.client.view.html
index 43ef5c36..725c7f89 100644
--- a/modules/users/client/views/admin/user-seeding.client.view.html
+++ b/modules/users/client/views/admin/user-seeding.client.view.html
@@ -64,9 +64,9 @@
                                     <div class="media-body">
                                         <h5 class="media-heading">
                                             <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
-                                            <span>{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</span>
                                             <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                                <span user-info="item.torrent.user" info-name></span> )</span>
+                                                <span user-info="item.torrent.user" info-name></span> <span
+                                                        maker-info="item.torrent.maker"></span>)</span>
                                         </h5>
 
                                         <div class="list-all-genres">
diff --git a/modules/users/client/views/admin/user-uplist.client.view.html b/modules/users/client/views/admin/user-uplist.client.view.html
index c33a6a52..2e41af2d 100644
--- a/modules/users/client/views/admin/user-uplist.client.view.html
+++ b/modules/users/client/views/admin/user-uplist.client.view.html
@@ -60,8 +60,6 @@
                                     <div class="media-body">
                                         <h5 class="media-heading">
                                             <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                            <span class="upload-by" ng-show="item.user.displayName"> (By:
-                                                <span user-info="item.user" info-name></span> )</span>
                                         </h5>
 
                                         <div class="list-all-genres">
diff --git a/modules/users/client/views/admin/user-warning.client.view.html b/modules/users/client/views/admin/user-warning.client.view.html
index 6733a248..c7c49030 100644
--- a/modules/users/client/views/admin/user-warning.client.view.html
+++ b/modules/users/client/views/admin/user-warning.client.view.html
@@ -43,7 +43,8 @@
                         </tr>
                     </thead>
                     <tbody>
-                        <tr class="torrent-list-info" ng-repeat="item in vm.userWarningList" ng-click="vm.TGI.openTorrentDetailInfo(item.torrent._id);">
+                        <tr class="torrent-list-info" ng-repeat="item in vm.userWarningList"
+                            ng-click="vm.TGI.openTorrentDetailInfo(item.torrent._id);">
                             <td class="col-md-7 td-text-overflow">
                                 <div class="media">
                                     <div class="media-left">
@@ -63,7 +64,8 @@
                                         <h5 class="media-heading">
                                             <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
                                             <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                                <span user-info="item.torrent.user" info-name></span> )</span>
+                                                <span user-info="item.torrent.user" info-name></span> <span
+                                                        maker-info="item.torrent.maker"></span>)</span>
                                         </h5>
 
                                         <div class="list-all-genres">
diff --git a/modules/users/client/views/status/downloading.client.view.html b/modules/users/client/views/status/downloading.client.view.html
index a33cbce3..010943e2 100644
--- a/modules/users/client/views/status/downloading.client.view.html
+++ b/modules/users/client/views/status/downloading.client.view.html
@@ -65,7 +65,7 @@
                                         <h5 class="media-heading">
                                             <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
                                             <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                            <span user-info="item.torrent.user" info-name></span> )</span>
+                                                <span user-info="item.torrent.user" info-name></span>  <span maker-info="item.torrent.maker"></span>)</span>
                                         </h5>
 
                                         <div class="list-all-genres">
diff --git a/modules/users/client/views/status/seeding.client.view.html b/modules/users/client/views/status/seeding.client.view.html
index e0857966..e5179e0f 100644
--- a/modules/users/client/views/status/seeding.client.view.html
+++ b/modules/users/client/views/status/seeding.client.view.html
@@ -65,7 +65,7 @@
                                         <h5 class="media-heading">
                                             <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
                                             <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                                <span user-info="item.torrent.user" info-name></span> )</span>
+                                                <span user-info="item.torrent.user" info-name></span>  <span maker-info="item.torrent.maker"></span>)</span>
                                         </h5>
 
                                         <div class="list-all-genres">
diff --git a/modules/users/client/views/status/uploaded.client.view.html b/modules/users/client/views/status/uploaded.client.view.html
index 229f21f7..35199fe9 100644
--- a/modules/users/client/views/status/uploaded.client.view.html
+++ b/modules/users/client/views/status/uploaded.client.view.html
@@ -60,8 +60,6 @@
                                     <div class="media-body">
                                         <h5 class="media-heading">
                                             <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                            <span class="upload-by" ng-show="item.user.displayName"> (By:
-                                                <span user-info="item.user" info-name></span> )</span>
                                         </h5>
 
                                         <div class="list-all-genres">
diff --git a/modules/users/client/views/status/warning.client.view.html b/modules/users/client/views/status/warning.client.view.html
index b5fd27a5..710604ab 100644
--- a/modules/users/client/views/status/warning.client.view.html
+++ b/modules/users/client/views/status/warning.client.view.html
@@ -57,7 +57,7 @@
                                         <h5 class="media-heading">
                                             <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
                                             <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                            <span user-info="item.torrent.user" info-name></span> )</span>
+                                                <span user-info="item.torrent.user" info-name></span>  <span maker-info="item.torrent.maker"></span>)</span>
                                         </h5>
 
                                         <div class="list-all-genres">
diff --git a/modules/users/server/controllers/admin.server.controller.js b/modules/users/server/controllers/admin.server.controller.js
index cebc275a..836b069d 100644
--- a/modules/users/server/controllers/admin.server.controller.js
+++ b/modules/users/server/controllers/admin.server.controller.js
@@ -424,10 +424,10 @@ exports.getUserSeeding = function (req, res) {
   }).sort('-peer_uploaded')
     .populate({
       path: 'torrent',
-      populate: {
-        path: 'user',
-        select: 'displayName profileImageURL'
-      }
+      populate: [
+        {path: 'user', select: 'displayName profileImageURL'},
+        {path: 'maker', select: 'name'}
+      ]
     })
     .exec(function (err, torrents) {
       if (err) {
@@ -452,10 +452,10 @@ exports.getUserLeeching = function (req, res) {
   }).sort('-peer_downloaded')
     .populate({
       path: 'torrent',
-      populate: {
-        path: 'user',
-        select: 'displayName profileImageURL'
-      }
+      populate: [
+        {path: 'user', select: 'displayName profileImageURL'},
+        {path: 'maker', select: 'name'}
+      ]
     })
     .exec(function (err, torrents) {
       if (err) {
@@ -479,10 +479,10 @@ exports.getUserWarning = function (req, res) {
     hnr_warning: true
   }).populate({
     path: 'torrent',
-    populate: {
-      path: 'user',
-      select: 'displayName profileImageURL'
-    }
+    populate: [
+      {path: 'user', select: 'displayName profileImageURL'},
+      {path: 'maker', select: 'name'}
+    ]
   }).exec(function (err, complets) {
     if (err) {
       return res.status(422).send({
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index 7c8596e9..15b307e9 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -204,8 +204,6 @@
                                         <div class="media-body">
                                             <h5 class="media-heading">
                                                 <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                                <span class="upload-by" ng-show="item.user.displayName"> (By:
-                                                <span user-info="item.user" info-name></span> )</span>
                                             </h5>
 
                                             <div class="list-all-genres">