diff --git a/app/partials/views/modules/lightbox_add-edit-task.jade b/app/partials/views/modules/lightbox_add-edit-task.jade
index 77d201f5..7c0d638d 100644
--- a/app/partials/views/modules/lightbox_add-edit-task.jade
+++ b/app/partials/views/modules/lightbox_add-edit-task.jade
@@ -3,7 +3,7 @@ a.close(href="", title="close")
 form
     h2.title(tg-i18n="task.title-new")
     fieldset
-        input(type="text", ng-model="task.subject", placeholder="A task subject", data-required="true")
+        input(type="text", ng-model="task.subject", placeholder="A task subject", data-required="true", data-maxlength="500")
     fieldset
         select(ng-model="task.status", ng-options="s.id as s.name for s in taskStatusList",
                placeholder="Task status")
diff --git a/app/partials/views/modules/lightbox_add-new-us.jade b/app/partials/views/modules/lightbox_add-new-us.jade
index d2b054b7..7603ab58 100644
--- a/app/partials/views/modules/lightbox_add-new-us.jade
+++ b/app/partials/views/modules/lightbox_add-new-us.jade
@@ -3,7 +3,7 @@ a.close(href="", title="close")
 form
     h2.title(tg-i18n="us.title-new")
     fieldset
-        input(type="text", ng-model="us.subject", tg-i18n="placeholder:common.subject", data-required="true")
+        input(type="text", ng-model="us.subject", tg-i18n="placeholder:common.subject", data-required="true", data-maxlength="500")
     fieldset
         select(ng-model="us.status", ng-options="s.id as s.name for s in usStatusList",
                tg-i18n="placeholder:common.status")