3 files changed, 3 insertions, 6 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 8cf0ab60fd3..cd099173718 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -164,10 +164,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     params.delete(:domain_denylist_raw) if params[:domain_denylist]
     params.delete(:domain_allowlist_raw) if params[:domain_allowlist]
 
-    if params[:application_setting].key?(:user_email_lookup_limit)
-      params[:application_setting][:search_rate_limit] ||= params[:application_setting][:user_email_lookup_limit]
-    end
-
     params[:application_setting].permit(visible_application_setting_attributes)
   end
 
@@ -183,6 +179,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       *::ApplicationSettingsHelper.visible_attributes,
       *::ApplicationSettingsHelper.external_authorization_service_attributes,
       *ApplicationSetting.kroki_formats_attributes.keys.map { |key| "kroki_formats_#{key}".to_sym },
+      :can_create_organization,
       :lets_encrypt_notification_email,
       :lets_encrypt_terms_of_service_accepted,
       :domain_denylist_file,
diff --git a/app/controllers/admin/clusters_controller.rb b/app/controllers/admin/clusters_controller.rb
index 052c8821588..ead02a7aa8c 100644
--- a/app/controllers/admin/clusters_controller.rb
+++ b/app/controllers/admin/clusters_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::ClustersController < Clusters::ClustersController
+class Admin::ClustersController < ::Clusters::ClustersController
   include EnforcesAdminAuthentication
   before_action :ensure_feature_enabled!
 
diff --git a/app/controllers/admin/deploy_keys_controller.rb b/app/controllers/admin/deploy_keys_controller.rb
index b24b25446b0..a9b34bf56f6 100644
--- a/app/controllers/admin/deploy_keys_controller.rb
+++ b/app/controllers/admin/deploy_keys_controller.rb
@@ -55,7 +55,7 @@ class Admin::DeployKeysController < Admin::ApplicationController
   end
 
   def create_params
-    params.require(:deploy_key).permit(:key, :title)
+    params.require(:deploy_key).permit(:key, :title, :expires_at)
   end
 
   def update_params