diff --git a/app/models/organization.rb b/app/models/organization.rb
index 63baf7d59..04aea22f3 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -48,7 +48,7 @@ class Organization < ApplicationRecord
validates :secret, length: { is: 100 }, allow_nil: true
validates :secret, uniqueness: true
validates :slug, exclusion: { in: ReservedWords.all, message: :reserved_word }
- validates :slug, format: { with: SLUG_REGEXP }, length: { in: 2..18 }
+ validates :slug, format: { with: SLUG_REGEXP }, length: { in: 2..30 }
validates :slug, presence: true, uniqueness: { case_sensitive: false }
validates :spent_credits_count, presence: true
validates :summary, length: { maximum: 250 }
diff --git a/app/views/users/_org_admin.html.erb b/app/views/users/_org_admin.html.erb
index b16378f9d..90199d158 100644
--- a/app/views/users/_org_admin.html.erb
+++ b/app/views/users/_org_admin.html.erb
@@ -83,7 +83,7 @@
<%= f.label :slug, class: "crayons-field__label" %>
- <%= f.text_field :slug, maxlength: 18, minlength: 2, class: "crayons-textfield" %>
+ <%= f.text_field :slug, maxlength: 30, minlength: 2, class: "crayons-textfield" %>
<%= t("views.settings.org.admin.form.slug", slug: app_url(@organization.slug)) %>
diff --git a/spec/models/organization_spec.rb b/spec/models/organization_spec.rb
index 8acef551a..01841a589 100644
--- a/spec/models/organization_spec.rb
+++ b/spec/models/organization_spec.rb
@@ -1,6 +1,6 @@
require "rails_helper"
-RSpec.describe Organization, type: :model do
+RSpec.describe Organization do
let(:organization) { create(:organization) }
describe "validations" do
@@ -27,7 +27,7 @@ RSpec.describe Organization, type: :model do
it { is_expected.to validate_length_of(:name).is_at_most(50) }
it { is_expected.to validate_length_of(:proof).is_at_most(1500) }
it { is_expected.to validate_length_of(:secret).is_equal_to(100) }
- it { is_expected.to validate_length_of(:slug).is_at_least(2).is_at_most(18) }
+ it { is_expected.to validate_length_of(:slug).is_at_least(2).is_at_most(30) }
it { is_expected.to validate_length_of(:story).is_at_most(640) }
it { is_expected.to validate_length_of(:tag_line).is_at_most(60) }
it { is_expected.to validate_length_of(:tech_stack).is_at_most(640) }