diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index 1b2219ecb..413a0e892 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -32,7 +32,7 @@
             <div class="small-12 medium-4">
           <% if @account.organization? %>
             <%= f.fields_for :organization do |fo| %>
-              <%= fo.text_field :name, autofocus: true, maxlength: Organization::NAME_LENGTH[:maximum], placeholder: t("account.show.organization_name_label") %>
+              <%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("account.show.organization_name_label") %>
             <% end %>
             <%= f.text_field :phone_number, placeholder: t("account.show.phone_number_label") %>
 
diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb
index 7aa23187d..1b95a2d5d 100644
--- a/app/views/organizations/registrations/new.html.erb
+++ b/app/views/organizations/registrations/new.html.erb
@@ -6,7 +6,7 @@
      <div class="small-12 column">
 
       <%= f.fields_for :organization do |fo| %>
-        <%= fo.text_field :name, autofocus: true, maxlength: Organization::NAME_LENGTH[:maximum], placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %>
+        <%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %>
       <% end %>
 
       <%= f.email_field :email,     placeholder: t("devise_views.organizations.registrations.new.email_label") %>