diff --git a/app/graphql/resolvers/customer_portal/available_plans_resolver.rb b/app/graphql/resolvers/customer_portal/available_plans_resolver.rb
index 9c71dac35c1f..8b5c1aa139bf 100644
--- a/app/graphql/resolvers/customer_portal/available_plans_resolver.rb
+++ b/app/graphql/resolvers/customer_portal/available_plans_resolver.rb
@@ -16,10 +16,10 @@ class AvailablePlansResolver < Resolvers::BaseResolver
 
       description "Lists plans available to the customer portal user, filtered by product"
 
-      argument :product_key, String, required: false,
-        description: "Filter to plans whose code starts with `${product_key}-`"
       argument :exclude_current, Boolean, required: false, default_value: false,
         description: "Omit plans the customer already has an active subscription to"
+      argument :product_key, String, required: false,
+        description: "Filter to plans whose code starts with `${product_key}-`"
 
       type [Types::Plans::Object], null: false
 
diff --git a/app/services/plans/create_service.rb b/app/services/plans/create_service.rb
index 48e27422957c..f7a2902ddefb 100644
--- a/app/services/plans/create_service.rb
+++ b/app/services/plans/create_service.rb
@@ -28,7 +28,7 @@ def call
         trial_period: args[:trial_period],
         bill_charges_monthly: bill_charges_monthly(args),
         bill_fixed_charges_monthly: bill_fixed_charges_monthly(args),
-        self_serve: args[:self_serve].nil? ? true : args[:self_serve]
+        self_serve: args[:self_serve] != false
       )
 
       chargeables_validation_result = Plans::ChargeablesValidationService.call(