4 files changed, 7 insertions, 6 deletions

diff --git a/client/src/app/shared/forms/form-validators/video.ts b/client/src/app/shared/forms/form-validators/video.ts
index 213ab15db..286a11179 100644
--- a/client/src/app/shared/forms/form-validators/video.ts
+++ b/client/src/app/shared/forms/form-validators/video.ts
@@ -1,11 +1,11 @@
 import { Validators } from '@angular/forms'
 
 export const VIDEO_NAME = {
-  VALIDATORS: [ Validators.required, Validators.minLength(3), Validators.maxLength(50) ],
+  VALIDATORS: [ Validators.required, Validators.minLength(3), Validators.maxLength(120) ],
   MESSAGES: {
     'required': 'Video name is required.',
     'minlength': 'Video name must be at least 3 characters long.',
-    'maxlength': 'Video name cannot be more than 50 characters long.'
+    'maxlength': 'Video name cannot be more than 120 characters long.'
   }
 }
 
@@ -45,10 +45,10 @@ export const VIDEO_DESCRIPTION = {
 }
 
 export const VIDEO_TAGS = {
-  VALIDATORS: [ Validators.minLength(2), Validators.maxLength(10) ],
+  VALIDATORS: [ Validators.minLength(2), Validators.maxLength(30) ],
   MESSAGES: {
     'minlength': 'A tag should be more than 2 characters long.',
-    'maxlength': 'A tag should be less than 10 characters long.'
+    'maxlength': 'A tag should be less than 30 characters long.'
   }
 }
 
diff --git a/client/src/app/videos/+video-edit/video-add.component.html b/client/src/app/videos/+video-edit/video-add.component.html
index 7946c0879..136c82a7c 100644
--- a/client/src/app/videos/+video-edit/video-add.component.html
+++ b/client/src/app/videos/+video-edit/video-add.component.html
@@ -77,7 +77,7 @@
         <label class="label-tags">Tags</label> <span class="little-information">(press enter to add the tag)</span>
         <tag-input
           [ngModel]="tags" [validators]="tagValidators" [errorMessages]="tagValidatorsMessages"
-          formControlName="tags" maxItems="3" modelAsStrings="true"
+          formControlName="tags" maxItems="5" modelAsStrings="true"
         ></tag-input>
       </div>
 
diff --git a/client/src/app/videos/+video-edit/video-update.component.html b/client/src/app/videos/+video-edit/video-update.component.html
index 7f4faf21b..4ade5a671 100644
--- a/client/src/app/videos/+video-edit/video-update.component.html
+++ b/client/src/app/videos/+video-edit/video-update.component.html
@@ -65,7 +65,7 @@
       <label for="tags" class="label-tags">Tags</label> <span class="little-information">(press enter to add the tag)</span>
       <tag-input
         [ngModel]="tags" [validators]="tagValidators" [errorMessages]="tagValidatorsMessages"
-        formControlName="tags" maxItems="3" modelAsStrings="true"
+        formControlName="tags" maxItems="5" modelAsStrings="true"
       ></tag-input>
     </div>
 
diff --git a/client/src/app/videos/+video-edit/video-update.component.ts b/client/src/app/videos/+video-edit/video-update.component.ts
index 30390ac05..c4ae22896 100644
--- a/client/src/app/videos/+video-edit/video-update.component.ts
+++ b/client/src/app/videos/+video-edit/video-update.component.ts
@@ -131,3 +131,4 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     this.form.patchValue(this.video.toJSON())
   }
 }
+