3 files changed, 28 insertions, 7 deletions

diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html
index 0447268f0..fb6d08167 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
@@ -144,15 +144,23 @@
 
           <div class="pt-3 border-top video-info-channel d-flex">
             <div class="video-info-channel-left d-flex">
-              <avatar-channel [video]="video"></avatar-channel>
+              <avatar-channel [video]="video" [genericChannel]="isChannelDisplayNameGeneric()"></avatar-channel>
 
               <div class="video-info-channel-left-links ml-1">
-                <a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Channel page">
-                  {{ video.channel.displayName }}
-                </a>
-                <a [routerLink]="[ '/accounts', video.byAccount ]" i18n-title title="Account page">
-                  <span i18n>By {{ video.byAccount }}</span>
-                </a>
+                <ng-container *ngIf="!isChannelDisplayNameGeneric()">
+                  <a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Channel page">
+                    {{ video.channel.displayName }}
+                  </a>
+                  <a [routerLink]="[ '/accounts', video.byAccount ]" i18n-title title="Account page">
+                    <span i18n>By {{ video.byAccount }}</span>
+                  </a>
+                </ng-container>
+
+                <ng-container *ngIf="isChannelDisplayNameGeneric()">
+                  <a [routerLink]="[ '/accounts', video.byAccount ]" class="single-link" i18n-title title="Account page">
+                    <span i18n>{{ video.byAccount }}</span>
+                  </a>
+                </ng-container>
               </div>
             </div>
 
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.scss b/client/src/app/+videos/+video-watch/video-watch.component.scss
index c7f91f4a0..00a4b0dee 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/+videos/+video-watch/video-watch.component.scss
@@ -192,6 +192,10 @@ $video-info-margin-left: 44px;
               font-weight: 500;
               font-size: 90%;
             }
+
+            a.single-link {
+              margin-top: 7px;
+            }
           }
         }
 
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index 933e6c51f..4341514cd 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -307,6 +307,15 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     )
   }
 
+  isChannelDisplayNameGeneric () {
+    const genericChannelDisplayName = [
+      `Main ${this.video.channel.ownerAccount.name} channel`,
+      `Default ${this.video.channel.ownerAccount.name} channel`
+    ]
+
+    return genericChannelDisplayName.includes(this.video.channel.displayName)
+  }
+
   private loadVideo (videoId: string) {
     // Video did not change
     if (this.video && this.video.uuid === videoId) return