4 files changed, 17 insertions, 7 deletions

diff --git a/client/src/app/header/header.component.ts b/client/src/app/header/header.component.ts
index 6b0ee67ff..42de2dd92 100644
--- a/client/src/app/header/header.component.ts
+++ b/client/src/app/header/header.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { Router } from '@angular/router'
+import { Router, NavigationEnd } from '@angular/router'
 import { getParameterByName } from '../shared/misc/utils'
 
 @Component({
@@ -14,8 +14,11 @@ export class HeaderComponent implements OnInit {
   constructor (private router: Router) {}
 
   ngOnInit () {
-    const searchQuery = getParameterByName('search', window.location.href)
-    if (searchQuery) this.searchValue = searchQuery
+    this.router.events
+        .filter(e => e instanceof NavigationEnd)
+        .map(() => getParameterByName('search', window.location.href))
+        .filter(searchQuery => !!searchQuery)
+        .subscribe(searchQuery => this.searchValue = searchQuery)
   }
 
   doSearch () {
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 52e3e429a..91e590094 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -22,8 +22,11 @@
           </div>
 
           <div class="video-info-by">
-            By {{ video.by }}
-            <img [src]="getAvatarPath()" alt="Account avatar" />
+            <a [routerLink]="[ '/videos', 'search' ]" [queryParams]="{ search: video.account.name }" title="Search videos of this account">
+              By {{ video.by }}
+              <img [src]="getAvatarPath()" alt="Account avatar" />
+            </a>
+
             <my-video-feed [syndicationItems]="syndicationItems"></my-video-feed>
           </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 8a3e2584b..3ebeccd4b 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -73,6 +73,11 @@
         align-items: center;
         font-size: 13px;
 
+        a {
+          color: black;
+          display: inline-block;
+        }
+
         img {
           @include avatar(18px);
 
diff --git a/client/src/app/videos/video-list/video-search.component.ts b/client/src/app/videos/video-list/video-search.component.ts
index ef9afa757..46a9dd48e 100644
--- a/client/src/app/videos/video-list/video-search.component.ts
+++ b/client/src/app/videos/video-list/video-search.component.ts
@@ -7,7 +7,6 @@ import { Subscription } from 'rxjs/Subscription'
 import { AuthService } from '../../core/auth'
 import { AbstractVideoList } from '../../shared/video/abstract-video-list'
 import { VideoService } from '../../shared/video/video.service'
-import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum'
 
 @Component({
   selector: 'my-videos-search',
@@ -64,6 +63,6 @@ export class VideoSearchComponent extends AbstractVideoList implements OnInit, O
   }
 
   generateSyndicationList () {
-    throw new Error('Method not implemented.')
+    throw new Error('Search does not support syndication.')
   }
 }