diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index 5fe455a6f..3e42cc588 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -32,12 +32,12 @@
<% if @account.organization? %>
<%= f.fields_for :organization do |fo| %>
- <%= fo.text_field :name, autofocus: true, placeholder: t("account.show.organization_name_label") %>
+ <%= fo.text_field :name, autofocus: true, maxlength: Organization::NAME_LENGTH[:maximum], placeholder: t("account.show.organization_name_label") %>
<% end %>
<%= f.text_field :phone_number, placeholder: t("account.show.phone_number_label") %>
<% else %>
- <%= f.text_field :username, placeholder: t("account.show.username_label") %>
+ <%= f.text_field :username, maxlength: User::USERNAME_LENGTH[:maximum], placeholder: t("account.show.username_label") %>
<% end %>
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 5c9f4eab2..7efe50110 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -2,7 +2,7 @@