2 files changed, 11 insertions, 11 deletions

diff --git a/client/src/app/header/header.component.html b/client/src/app/header/header.component.html
index 4b3d5e105..599861817 100644
--- a/client/src/app/header/header.component.html
+++ b/client/src/app/header/header.component.html
@@ -4,7 +4,7 @@
 >
 <span (click)="doSearch()" class="icon icon-search"></span>
 
-<a class="upload-button" (click)="goToUpload()">
+<a class="upload-button" [routerLink]="routerLink">
   <my-global-icon iconName="upload"></my-global-icon>
   <span i18n class="upload-button-label">Upload</span>
 </a>
diff --git a/client/src/app/header/header.component.ts b/client/src/app/header/header.component.ts
index 192d6945b..580535669 100644
--- a/client/src/app/header/header.component.ts
+++ b/client/src/app/header/header.component.ts
@@ -42,6 +42,16 @@ export class HeaderComponent implements OnInit {
     )
   }
 
+  get routerLink () {
+    if (this.isUserLoggedIn()) {
+      return [ '/videos/upload' ]
+    } else if (this.isRegistrationAllowed()) {
+      return [ '/signup' ]
+    } else {
+      return [ '/login', { fromUpload: true } ]
+    }
+  }
+
   doSearch () {
     const queryParams: Params = {}
 
@@ -67,16 +77,6 @@ export class HeaderComponent implements OnInit {
            this.serverConfig.signup.allowedForCurrentIP
   }
 
-  goToUpload () {
-    if (this.isUserLoggedIn()) {
-      this.router.navigate([ '/videos/upload' ])
-    } else if (this.isRegistrationAllowed()) {
-      this.router.navigate([ '/signup' ])
-    } else {
-      this.router.navigate([ '/login', { fromUpload: true } ])
-    }
-  }
-
   private loadUserLanguagesIfNeeded (queryParams: any) {
     if (queryParams && queryParams.languageOneOf) return of(queryParams)