From f4e1ddd0a47cc255c80faa191fb833cc76ef72d2 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 17 Jul 2026 11:56:47 -0400
Subject: [PATCH 1/5] Ability to Enable Pro from the Getting Started state

---
 resources/js/pages/Dashboard.vue                |  8 +++++++-
 routes/cp.php                                   |  1 +
 src/Http/Controllers/CP/DashboardController.php | 10 ++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/resources/js/pages/Dashboard.vue b/resources/js/pages/Dashboard.vue
index 57d1d9cb1ab..0fb83de5d5e 100644
--- a/resources/js/pages/Dashboard.vue
+++ b/resources/js/pages/Dashboard.vue
@@ -1,4 +1,5 @@
 <script setup>
+import { router } from '@inertiajs/vue3';
 import Head from '@/pages/layout/Head.vue';
 import DynamicHtmlRenderer from '@/components/DynamicHtmlRenderer.vue';
 import { Icon, EmptyStateMenu, EmptyStateItem, DocsCallout } from '@ui';
@@ -7,6 +8,7 @@ import useArchitecturalBackground from '@/pages/layout/architectural-background.
 const props = defineProps({
     widgets: Array,
     pro: Boolean,
+    enableProUrl: String,
     blueprintsUrl: String,
     collectionsCreateUrl: String,
     navigationCreateUrl: String,
@@ -14,6 +16,10 @@ const props = defineProps({
 
 if (props.widgets.length === 0) useArchitecturalBackground();
 
+function enablePro() {
+    router.post(props.enableProUrl);
+}
+
 function classes(widget) {
     return `${widget.classes} ${tailwindWidthClass(widget.width)}`;
 }
@@ -80,10 +86,10 @@ function tailwindWidthClass(width) {
             />
             <EmptyStateItem
                 v-if="!pro"
-                href="https://statamic.dev/licensing"
                 icon="pro-ribbon"
                 :heading="__('Enable Pro Mode')"
                 :description="__('statamic::messages.getting_started_widget_pro')"
+                @click="enablePro"
             />
             <EmptyStateItem
                 :href="blueprintsUrl"
diff --git a/routes/cp.php b/routes/cp.php
index 2227c479a98..d4fde85593e 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -162,6 +162,7 @@
 
     Route::get('/', StartPageController::class)->name('index');
     Route::get('dashboard', [DashboardController::class, 'index'])->name('dashboard');
+    Route::post('dashboard/enable-pro', [DashboardController::class, 'enablePro'])->name('dashboard.enable-pro');
 
     Route::get('select-site/{handle}', [SelectSiteController::class, 'select']);
 
diff --git a/src/Http/Controllers/CP/DashboardController.php b/src/Http/Controllers/CP/DashboardController.php
index be23e7b0057..3a80c7e2790 100644
--- a/src/Http/Controllers/CP/DashboardController.php
+++ b/src/Http/Controllers/CP/DashboardController.php
@@ -10,6 +10,8 @@
 use Statamic\Support\Arr;
 use Statamic\Widgets\Loader;
 
+use function Statamic\trans as __;
+
 class DashboardController extends CpController
 {
     /**
@@ -24,12 +26,20 @@ public function index(Loader $loader)
         return Inertia::render('Dashboard', [
             'widgets' => $widgets,
             'pro' => Statamic::pro(),
+            'enableProUrl' => cp_route('dashboard.enable-pro'),
             'blueprintsUrl' => cp_route('blueprints.index'),
             'collectionsCreateUrl' => cp_route('collections.create'),
             'navigationCreateUrl' => cp_route('navigation.create'),
         ]);
     }
 
+    public function enablePro()
+    {
+        Statamic::enablePro();
+
+        return back()->withSuccess(__('Statamic Pro enabled'));
+    }
+
     /**
      * Get displayable widgets.
      *

From 6aecdc2ff6f350bf5b4eb8a2c805a06e997e2845 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 17 Jul 2026 13:38:48 -0400
Subject: [PATCH 2/5] permission checks + confirmation

---
 resources/js/pages/Dashboard.vue              | 32 ++++++++++++++++---
 .../Controllers/CP/DashboardController.php    |  6 ++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/resources/js/pages/Dashboard.vue b/resources/js/pages/Dashboard.vue
index 0fb83de5d5e..6d6deaf9b90 100644
--- a/resources/js/pages/Dashboard.vue
+++ b/resources/js/pages/Dashboard.vue
@@ -1,13 +1,15 @@
 <script setup>
+import { ref } from 'vue';
 import { router } from '@inertiajs/vue3';
 import Head from '@/pages/layout/Head.vue';
 import DynamicHtmlRenderer from '@/components/DynamicHtmlRenderer.vue';
-import { Icon, EmptyStateMenu, EmptyStateItem, DocsCallout } from '@ui';
+import { Icon, EmptyStateMenu, EmptyStateItem, DocsCallout, ConfirmationModal } from '@ui';
 import useArchitecturalBackground from '@/pages/layout/architectural-background.js';
 
 const props = defineProps({
     widgets: Array,
     pro: Boolean,
+    canEnablePro: Boolean,
     enableProUrl: String,
     blueprintsUrl: String,
     collectionsCreateUrl: String,
@@ -16,8 +18,20 @@ const props = defineProps({
 
 if (props.widgets.length === 0) useArchitecturalBackground();
 
+const confirmingEnablePro = ref(false);
+const enablingPro = ref(false);
+
 function enablePro() {
-    router.post(props.enableProUrl);
+    enablingPro.value = true;
+
+    router.post(props.enableProUrl, {}, {
+        onSuccess: () => {
+            confirmingEnablePro.value = false;
+        },
+        onFinish: () => {
+            enablingPro.value = false;
+        },
+    });
 }
 
 function classes(widget) {
@@ -85,11 +99,11 @@ function tailwindWidthClass(width) {
                 :description="__('statamic::messages.getting_started_widget_docs')"
             />
             <EmptyStateItem
-                v-if="!pro"
+                v-if="!pro && canEnablePro"
                 icon="pro-ribbon"
                 :heading="__('Enable Pro Mode')"
                 :description="__('statamic::messages.getting_started_widget_pro')"
-                @click="enablePro"
+                @click="confirmingEnablePro = true"
             />
             <EmptyStateItem
                 :href="blueprintsUrl"
@@ -110,6 +124,16 @@ function tailwindWidthClass(width) {
                 :description="__('statamic::messages.getting_started_widget_navigation')"
             />
         </EmptyStateMenu>
+
+        <ConfirmationModal
+            v-model:open="confirmingEnablePro"
+            :title="__('Enable Statamic Pro?')"
+            :body-text="__('statamic::messages.getting_started_widget_pro')"
+            :button-text="__('Enable Pro Mode')"
+            :busy="enablingPro"
+            blur
+            @confirm="enablePro"
+        />
     </template>
 
     <DocsCallout :topic="__('Widgets')" url="widgets" />
diff --git a/src/Http/Controllers/CP/DashboardController.php b/src/Http/Controllers/CP/DashboardController.php
index 3a80c7e2790..53e827e11e7 100644
--- a/src/Http/Controllers/CP/DashboardController.php
+++ b/src/Http/Controllers/CP/DashboardController.php
@@ -3,6 +3,7 @@
 namespace Statamic\Http\Controllers\CP;
 
 use Inertia\Inertia;
+use Statamic\Exceptions\AuthorizationException;
 use Statamic\Facades\Preference;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
@@ -26,6 +27,7 @@ public function index(Loader $loader)
         return Inertia::render('Dashboard', [
             'widgets' => $widgets,
             'pro' => Statamic::pro(),
+            'canEnablePro' => User::current()->isSuper(),
             'enableProUrl' => cp_route('dashboard.enable-pro'),
             'blueprintsUrl' => cp_route('blueprints.index'),
             'collectionsCreateUrl' => cp_route('collections.create'),
@@ -35,6 +37,10 @@ public function index(Loader $loader)
 
     public function enablePro()
     {
+        if (! User::current()->isSuper()) {
+            throw new AuthorizationException;
+        }
+
         Statamic::enablePro();
 
         return back()->withSuccess(__('Statamic Pro enabled'));

From 644fcbb847833a3f3c683caf83a7cdcdf05837a9 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Fri, 17 Jul 2026 15:38:24 -0400
Subject: [PATCH 3/5] Interactive license key check as part of enable confirm
 modal

---
 lang/en/messages.php                          |   4 +
 resources/js/pages/Dashboard.vue              | 123 ++++++++++++++++--
 src/Console/Commands/ProEnable.php            |  48 ++++++-
 .../Controllers/CP/DashboardController.php    |  52 +++++++-
 src/Licensing/Outpost.php                     |   2 +
 src/Statamic.php                              |  14 +-
 tests/Console/Commands/ProEnableTest.php      |  61 ++++++++-
 7 files changed, 281 insertions(+), 23 deletions(-)

diff --git a/lang/en/messages.php b/lang/en/messages.php
index b3b3062cb34..940e32cf3c1 100644
--- a/lang/en/messages.php
+++ b/lang/en/messages.php
@@ -146,6 +146,10 @@
     'getting_started_widget_intro' => 'Start building your new Statamic site with these steps.',
     'getting_started_widget_navigation' => 'Create multi-level lists of links for navigation bars, footers, side menus, and other site areas.',
     'getting_started_widget_pro' => 'Statamic Pro adds unlimited user accounts, roles, permissions, git integration, revisions, multi-site, and more!',
+    'enable_pro_license_required' => 'A Statamic Pro license is required. Enter your site license key below.',
+    'enable_pro_license_key_required' => 'Please enter your Statamic Pro license key.',
+    'enable_pro_license_key_invalid' => 'Invalid license key.',
+    'enable_pro_license_key_instructions' => 'Find your site license key at [statamic.com/account](https://statamic.com/account/sites).',
     'git_disabled' => 'Statamic Git integration is disabled.',
     'git_nothing_to_commit' => 'Nothing to commit.',
     'git_utility_description' => 'View and commit changes to git-tracked content and assets.',
diff --git a/resources/js/pages/Dashboard.vue b/resources/js/pages/Dashboard.vue
index 6d6deaf9b90..a0ac5b4034a 100644
--- a/resources/js/pages/Dashboard.vue
+++ b/resources/js/pages/Dashboard.vue
@@ -1,15 +1,16 @@
 <script setup>
-import { ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { router } from '@inertiajs/vue3';
 import Head from '@/pages/layout/Head.vue';
 import DynamicHtmlRenderer from '@/components/DynamicHtmlRenderer.vue';
-import { Icon, EmptyStateMenu, EmptyStateItem, DocsCallout, ConfirmationModal } from '@ui';
+import { Icon, EmptyStateMenu, EmptyStateItem, DocsCallout, Modal, ModalClose, Button, Field, Input, ErrorMessage } from '@ui';
 import useArchitecturalBackground from '@/pages/layout/architectural-background.js';
 
 const props = defineProps({
     widgets: Array,
     pro: Boolean,
     canEnablePro: Boolean,
+    hasLicenseKey: Boolean,
     enableProUrl: String,
     blueprintsUrl: String,
     collectionsCreateUrl: String,
@@ -20,14 +21,70 @@ if (props.widgets.length === 0) useArchitecturalBackground();
 
 const confirmingEnablePro = ref(false);
 const enablingPro = ref(false);
+const licenseKey = ref('');
+const licenseKeyError = ref(null);
+
+watch(confirmingEnablePro, (open) => {
+    if (!open) {
+        licenseKey.value = '';
+        licenseKeyError.value = null;
+    }
+});
+
+const trimmedLicenseKey = computed(() => licenseKey.value.trim());
+const hasValidEnteredKey = computed(() => /^[a-zA-Z0-9]{16}$/.test(trimmedLicenseKey.value));
+
+watch(trimmedLicenseKey, (key) => {
+    if (!key || hasValidEnteredKey.value) {
+        licenseKeyError.value = null;
+        return;
+    }
+
+    if (/[^a-zA-Z0-9]/.test(key) || key.length > 16) {
+        licenseKeyError.value = __('statamic::messages.enable_pro_license_key_invalid');
+    }
+});
+
+function validateLicenseKey() {
+    const key = trimmedLicenseKey.value;
+
+    if (!key) {
+        if (props.hasLicenseKey) {
+            licenseKeyError.value = null;
+            return true;
+        }
+
+        licenseKeyError.value = __('statamic::messages.enable_pro_license_key_required');
+        return false;
+    }
+
+    if (!hasValidEnteredKey.value) {
+        licenseKeyError.value = __('statamic::messages.enable_pro_license_key_invalid');
+        return false;
+    }
+
+    licenseKeyError.value = null;
+    return true;
+}
 
 function enablePro() {
+    if (!validateLicenseKey()) {
+        return;
+    }
+
     enablingPro.value = true;
 
-    router.post(props.enableProUrl, {}, {
+    router.post(props.enableProUrl, {
+        license_key: trimmedLicenseKey.value || null,
+    }, {
         onSuccess: () => {
             confirmingEnablePro.value = false;
         },
+        onError: (errors) => {
+            licenseKeyError.value = Array.isArray(errors.license_key)
+                ? errors.license_key[0]
+                : errors.license_key;
+        },
         onFinish: () => {
             enablingPro.value = false;
         },
@@ -125,15 +182,61 @@ function tailwindWidthClass(width) {
             />
         </EmptyStateMenu>
 
-        <ConfirmationModal
+        <Modal
             v-model:open="confirmingEnablePro"
-            :title="__('Enable Statamic Pro?')"
-            :body-text="__('statamic::messages.getting_started_widget_pro')"
-            :button-text="__('Enable Pro Mode')"
-            :busy="enablingPro"
+            :title="__('Enable Statamic Pro')"
+            :dismissible="!enablingPro"
             blur
-            @confirm="enablePro"
-        />
+        >
+            <div class="space-y-4">
+                <p class="text-gray-700 dark:text-gray-200 antialiased">
+                    {{ __('statamic::messages.enable_pro_license_required') }}
+                </p>
+
+                <div v-if="!hasLicenseKey" class="space-y-2" @keydown.enter="enablePro">
+                    <Field
+                        :instructions="__('statamic::messages.enable_pro_license_key_instructions')"
+                        instructions-below
+                    >
+                        <Input
+                            v-model="licenseKey"
+                            name="license_key"
+                            autocomplete="off"
+                            spellcheck="false"
+                            :placeholder="__('Enter License Key')"
+                            :disabled="enablingPro"
+                        />
+                        <ErrorMessage v-if="licenseKeyError" :text="licenseKeyError" class="mt-2" />
+                    </Field>
+                </div>
+
+                <p
+                    v-else
+                    class="text-sm text-gray-600 dark:text-gray-400 antialiased"
+                >
+                    {{ __('A license key is already configured for this site.') }}
+                </p>
+            </div>
+
+            <template #footer>
+                <div class="flex items-center justify-end gap-3 pt-3 pb-1">
+                    <ModalClose asChild>
+                        <Button
+                            variant="ghost"
+                            :disabled="enablingPro"
+                            :text="__('Cancel')"
+                        />
+                    </ModalClose>
+                    <Button
+                        variant="primary"
+                        :disabled="enablingPro"
+                        :loading="enablingPro"
+                        :text="__('Enable Pro Mode')"
+                        @click="enablePro"
+                    />
+                </div>
+            </template>
+        </Modal>
     </template>
 
     <DocsCallout :topic="__('Widgets')" url="widgets" />
diff --git a/src/Console/Commands/ProEnable.php b/src/Console/Commands/ProEnable.php
index ed111c006d6..ee692d753a1 100644
--- a/src/Console/Commands/ProEnable.php
+++ b/src/Console/Commands/ProEnable.php
@@ -19,7 +19,8 @@ class ProEnable extends Command
      */
     protected $signature = 'statamic:pro:enable
         { --force : Force the operation to run when in production }
-        { --update-config : Also update editions config to reference .env var }';
+        { --update-config : Also update editions config to reference .env var }
+        { --license-key= : Set the Statamic license key in .env }';
 
     /**
      * The console command description.
@@ -40,7 +41,7 @@ public function handle()
         }
 
         $this->checkInfo('Statamic Pro successfully enabled in .env file!');
-        $this->promptToSetLicenseKey();
+        $this->setOrPromptLicenseKey();
 
         if ($this->option('update-config') && $this->updateConfig()) {
             $this->checkInfo('Statamic editions config successfully updated to reference .env var!');
@@ -112,6 +113,28 @@ protected function appendProToEnv()
         file_put_contents($this->envPath(), $this->envContents()."\nSTATAMIC_PRO_ENABLED=true");
     }
 
+    /**
+     * Set license key from option, or prompt interactively.
+     *
+     * @return void
+     */
+    protected function setOrPromptLicenseKey()
+    {
+        if ($licenseKey = trim((string) $this->option('license-key'))) {
+            if (! preg_match('/^[a-zA-Z0-9]{16}$/', $licenseKey)) {
+                $this->crossLine('Invalid license key. Site keys are 16-character alphanumeric strings.');
+
+                return;
+            }
+
+            $this->setLicenseKey($licenseKey);
+
+            return;
+        }
+
+        $this->promptToSetLicenseKey();
+    }
+
     /**
      * Prompt to set the license key in the environment file.
      *
@@ -119,7 +142,7 @@ protected function appendProToEnv()
      */
     protected function promptToSetLicenseKey()
     {
-        if (! $this->input->isInteractive()) {
+        if (! $this->input->isInteractive() || ! defined('STDIN')) {
             return;
         }
 
@@ -135,12 +158,31 @@ protected function promptToSetLicenseKey()
             return;
         }
 
+        if (! preg_match('/^[a-zA-Z0-9]{16}$/', $licenseKey)) {
+            $this->crossLine('Invalid license key. Site keys are 16-character alphanumeric strings.');
+
+            return;
+        }
+
+        $this->setLicenseKey($licenseKey);
+    }
+
+    /**
+     * Set the license key in the environment file.
+     *
+     * @param  string  $licenseKey
+     * @return void
+     */
+    protected function setLicenseKey($licenseKey)
+    {
         if ($this->licenseKeyEnvVarExists()) {
             $this->replaceLicenseKeyInEnv($licenseKey);
         } else {
             $this->appendLicenseKeyToEnv($licenseKey);
         }
 
+        config()->set('statamic.system.license_key', $licenseKey);
+
         $this->checkInfo('Statamic license key saved in .env file.');
     }
 
diff --git a/src/Http/Controllers/CP/DashboardController.php b/src/Http/Controllers/CP/DashboardController.php
index 53e827e11e7..ac22e938123 100644
--- a/src/Http/Controllers/CP/DashboardController.php
+++ b/src/Http/Controllers/CP/DashboardController.php
@@ -2,11 +2,14 @@
 
 namespace Statamic\Http\Controllers\CP;
 
+use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
 use Inertia\Inertia;
 use Statamic\Exceptions\AuthorizationException;
 use Statamic\Facades\Preference;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
+use Statamic\Licensing\LicenseManager;
 use Statamic\Statamic;
 use Statamic\Support\Arr;
 use Statamic\Widgets\Loader;
@@ -23,11 +26,13 @@ class DashboardController extends CpController
     public function index(Loader $loader)
     {
         $widgets = $this->getDisplayableWidgets($loader);
+        $hasLicenseKey = filled(config('statamic.system.license_key'));
 
         return Inertia::render('Dashboard', [
             'widgets' => $widgets,
             'pro' => Statamic::pro(),
             'canEnablePro' => User::current()->isSuper(),
+            'hasLicenseKey' => $hasLicenseKey,
             'enableProUrl' => cp_route('dashboard.enable-pro'),
             'blueprintsUrl' => cp_route('blueprints.index'),
             'collectionsCreateUrl' => cp_route('collections.create'),
@@ -35,17 +40,60 @@ public function index(Loader $loader)
         ]);
     }
 
-    public function enablePro()
+    public function enablePro(Request $request, LicenseManager $licenses)
     {
         if (! User::current()->isSuper()) {
             throw new AuthorizationException;
         }
 
-        Statamic::enablePro();
+        $hasLicenseKey = filled(config('statamic.system.license_key'));
+        $licenseKey = trim((string) $request->input('license_key', ''));
+
+        $request->merge([
+            'license_key' => $licenseKey !== '' ? $licenseKey : null,
+        ]);
+
+        $request->validate([
+            'license_key' => [
+                $hasLicenseKey ? 'nullable' : 'required',
+                'string',
+                'regex:/^[a-zA-Z0-9]{16}$/',
+            ],
+        ], [
+            'license_key.required' => __('statamic::messages.enable_pro_license_key_required'),
+            'license_key.regex' => __('statamic::messages.enable_pro_license_key_invalid'),
+        ]);
+
+        if ($licenseKey !== '') {
+            $this->validateLicenseKeyWithOutpost($licenses, $licenseKey);
+        }
+
+        Statamic::enablePro($licenseKey !== '' ? $licenseKey : null);
 
         return back()->withSuccess(__('Statamic Pro enabled'));
     }
 
+    private function validateLicenseKeyWithOutpost(LicenseManager $licenses, string $licenseKey): void
+    {
+        config(['statamic.system.license_key' => $licenseKey]);
+
+        $licenses->refresh();
+
+        if ($licenses->outpostIsOffline() || $licenses->requestFailed()) {
+            throw ValidationException::withMessages([
+                'license_key' => $licenses->requestFailureMessage(),
+            ]);
+        }
+
+        $reason = Arr::get($licenses->site()->response() ?? [], 'reason');
+
+        if ($reason === 'unknown_site' || $licenses->site()->response() === null) {
+            throw ValidationException::withMessages([
+                'license_key' => __('statamic::messages.enable_pro_license_key_invalid'),
+            ]);
+        }
+    }
+
     /**
      * Get displayable widgets.
      *
diff --git a/src/Licensing/Outpost.php b/src/Licensing/Outpost.php
index 1f63b74714f..1f2db20466b 100644
--- a/src/Licensing/Outpost.php
+++ b/src/Licensing/Outpost.php
@@ -171,6 +171,8 @@ private function getCachedResponse()
 
     public function clearCachedResponse()
     {
+        $this->response = null;
+
         return $this->cache()->forget(self::CACHE_KEY);
     }
 
diff --git a/src/Statamic.php b/src/Statamic.php
index abb4e4d839e..ea04aa2d7cc 100644
--- a/src/Statamic.php
+++ b/src/Statamic.php
@@ -52,9 +52,19 @@ public static function pro()
         return config('statamic.editions.pro');
     }
 
-    public static function enablePro()
+    public static function enablePro(?string $licenseKey = null)
     {
-        Artisan::call('statamic:pro:enable', ['--update-config' => true]);
+        $parameters = [
+            '--update-config' => true,
+            '--force' => true,
+            '--no-interaction' => true,
+        ];
+
+        if ($licenseKey) {
+            $parameters['--license-key'] = $licenseKey;
+        }
+
+        Artisan::call('statamic:pro:enable', $parameters);
     }
 
     public static function availableScripts(Request $request)
diff --git a/tests/Console/Commands/ProEnableTest.php b/tests/Console/Commands/ProEnableTest.php
index 1679acf9216..8a0a452059c 100644
--- a/tests/Console/Commands/ProEnableTest.php
+++ b/tests/Console/Commands/ProEnableTest.php
@@ -239,12 +239,12 @@ public function it_can_set_license_key_while_enabling_pro()
     {
         $this
             ->artisan('statamic:pro:enable')
-            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'test-license-key');
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'aRadLicenseKey42');
 
         $this->assertEquals(<<<'ENV'
 APP_NAME=Statamic
 STATAMIC_PRO_ENABLED=true
-STATAMIC_LICENSE_KEY=test-license-key
+STATAMIC_LICENSE_KEY=aRadLicenseKey42
 ENV, $this->files->get($this->envPath));
     }
 
@@ -259,12 +259,12 @@ public function it_replaces_commented_license_key_line_instead_of_appending()
 
         $this
             ->artisan('statamic:pro:enable')
-            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'test-license-key');
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'aRadLicenseKey42');
 
         $this->assertEquals(<<<'ENV'
 APP_NAME=Statamic
 STATAMIC_PRO_ENABLED=true
-STATAMIC_LICENSE_KEY=test-license-key
+STATAMIC_LICENSE_KEY=aRadLicenseKey42
 ENV, $this->files->get($this->envPath));
     }
 
@@ -279,12 +279,12 @@ public function commented_non_empty_license_key_still_prompts_and_gets_replaced(
 
         $this
             ->artisan('statamic:pro:enable')
-            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'test-license-key');
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'aRadLicenseKey42');
 
         $this->assertEquals(<<<'ENV'
 APP_NAME=Statamic
 STATAMIC_PRO_ENABLED=true
-STATAMIC_LICENSE_KEY=test-license-key
+STATAMIC_LICENSE_KEY=aRadLicenseKey42
 ENV, $this->files->get($this->envPath));
     }
 
@@ -306,6 +306,55 @@ public function it_skips_license_key_prompt_in_non_interactive_mode()
 APP_NAME=Statamic
 STATAMIC_PRO_ENABLED=true
 STATAMIC_LICENSE_KEY=
+ENV, $this->files->get($this->envPath));
+    }
+
+    #[Test]
+    public function it_can_set_license_key_via_option()
+    {
+        $this
+            ->artisan('statamic:pro:enable', [
+                '--license-key' => 'aRadLicenseKey42',
+                '--no-interaction' => true,
+            ]);
+
+        $this->assertEquals(<<<'ENV'
+APP_NAME=Statamic
+STATAMIC_PRO_ENABLED=true
+STATAMIC_LICENSE_KEY=aRadLicenseKey42
+ENV, $this->files->get($this->envPath));
+        $this->assertEquals('aRadLicenseKey42', config('statamic.system.license_key'));
+    }
+
+    #[Test]
+    public function it_rejects_invalid_license_key_via_option()
+    {
+        $this
+            ->artisan('statamic:pro:enable', [
+                '--license-key' => 'not-a-valid-key',
+                '--no-interaction' => true,
+            ])
+            ->expectsOutputToContain('Invalid license key');
+
+        $this->assertEquals(<<<'ENV'
+APP_NAME=Statamic
+STATAMIC_PRO_ENABLED=true
+STATAMIC_LICENSE_KEY=
+ENV, $this->files->get($this->envPath));
+    }
+
+    #[Test]
+    public function it_rejects_invalid_license_key_from_prompt()
+    {
+        $this
+            ->artisan('statamic:pro:enable')
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'not-a-valid-key')
+            ->expectsOutputToContain('Invalid license key');
+
+        $this->assertEquals(<<<'ENV'
+APP_NAME=Statamic
+STATAMIC_PRO_ENABLED=true
+STATAMIC_LICENSE_KEY=
 ENV, $this->files->get($this->envPath));
     }
 }

From b54e39c56918a174756f91924c45ce2a9a77fdb0 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2026 10:46:58 -0400
Subject: [PATCH 4/5] Don't validate license key format

Let Outpost be the source of truth for key validity instead of hardcoding the 16-char alphanumeric format as a hard gate.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 resources/js/pages/Dashboard.vue              | 26 +---------
 src/Console/Commands/ProEnable.php            | 12 -----
 .../Controllers/CP/DashboardController.php    |  2 -
 tests/Console/Commands/ProEnableTest.php      | 50 ++++---------------
 4 files changed, 10 insertions(+), 80 deletions(-)

diff --git a/resources/js/pages/Dashboard.vue b/resources/js/pages/Dashboard.vue
index a0ac5b4034a..1c31e01b244 100644
--- a/resources/js/pages/Dashboard.vue
+++ b/resources/js/pages/Dashboard.vue
@@ -32,37 +32,13 @@ watch(confirmingEnablePro, (open) => {
 });
 
 const trimmedLicenseKey = computed(() => licenseKey.value.trim());
-const hasValidEnteredKey = computed(() => /^[a-zA-Z0-9]{16}$/.test(trimmedLicenseKey.value));
-
-watch(trimmedLicenseKey, (key) => {
-    if (!key || hasValidEnteredKey.value) {
-        licenseKeyError.value = null;
-        return;
-    }
-
-    if (/[^a-zA-Z0-9]/.test(key) || key.length > 16) {
-        licenseKeyError.value = __('statamic::messages.enable_pro_license_key_invalid');
-    }
-});
 
 function validateLicenseKey() {
-    const key = trimmedLicenseKey.value;
-
-    if (!key) {
-        if (props.hasLicenseKey) {
-            licenseKeyError.value = null;
-            return true;
-        }
-
+    if (!trimmedLicenseKey.value && !props.hasLicenseKey) {
         licenseKeyError.value = __('statamic::messages.enable_pro_license_key_required');
         return false;
     }
 
-    if (!hasValidEnteredKey.value) {
-        licenseKeyError.value = __('statamic::messages.enable_pro_license_key_invalid');
-        return false;
-    }
-
     licenseKeyError.value = null;
     return true;
 }
diff --git a/src/Console/Commands/ProEnable.php b/src/Console/Commands/ProEnable.php
index ee692d753a1..83275d5bba4 100644
--- a/src/Console/Commands/ProEnable.php
+++ b/src/Console/Commands/ProEnable.php
@@ -121,12 +121,6 @@ protected function appendProToEnv()
     protected function setOrPromptLicenseKey()
     {
         if ($licenseKey = trim((string) $this->option('license-key'))) {
-            if (! preg_match('/^[a-zA-Z0-9]{16}$/', $licenseKey)) {
-                $this->crossLine('Invalid license key. Site keys are 16-character alphanumeric strings.');
-
-                return;
-            }
-
             $this->setLicenseKey($licenseKey);
 
             return;
@@ -158,12 +152,6 @@ protected function promptToSetLicenseKey()
             return;
         }
 
-        if (! preg_match('/^[a-zA-Z0-9]{16}$/', $licenseKey)) {
-            $this->crossLine('Invalid license key. Site keys are 16-character alphanumeric strings.');
-
-            return;
-        }
-
         $this->setLicenseKey($licenseKey);
     }
 
diff --git a/src/Http/Controllers/CP/DashboardController.php b/src/Http/Controllers/CP/DashboardController.php
index ac22e938123..890196bd657 100644
--- a/src/Http/Controllers/CP/DashboardController.php
+++ b/src/Http/Controllers/CP/DashboardController.php
@@ -57,11 +57,9 @@ public function enablePro(Request $request, LicenseManager $licenses)
             'license_key' => [
                 $hasLicenseKey ? 'nullable' : 'required',
                 'string',
-                'regex:/^[a-zA-Z0-9]{16}$/',
             ],
         ], [
             'license_key.required' => __('statamic::messages.enable_pro_license_key_required'),
-            'license_key.regex' => __('statamic::messages.enable_pro_license_key_invalid'),
         ]);
 
         if ($licenseKey !== '') {
diff --git a/tests/Console/Commands/ProEnableTest.php b/tests/Console/Commands/ProEnableTest.php
index 8a0a452059c..4ab2d78b338 100644
--- a/tests/Console/Commands/ProEnableTest.php
+++ b/tests/Console/Commands/ProEnableTest.php
@@ -239,12 +239,12 @@ public function it_can_set_license_key_while_enabling_pro()
     {
         $this
             ->artisan('statamic:pro:enable')
-            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'aRadLicenseKey42');
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'test-license-key');
 
         $this->assertEquals(<<<'ENV'
 APP_NAME=Statamic
 STATAMIC_PRO_ENABLED=true
-STATAMIC_LICENSE_KEY=aRadLicenseKey42
+STATAMIC_LICENSE_KEY=test-license-key
 ENV, $this->files->get($this->envPath));
     }
 
@@ -259,12 +259,12 @@ public function it_replaces_commented_license_key_line_instead_of_appending()
 
         $this
             ->artisan('statamic:pro:enable')
-            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'aRadLicenseKey42');
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'test-license-key');
 
         $this->assertEquals(<<<'ENV'
 APP_NAME=Statamic
 STATAMIC_PRO_ENABLED=true
-STATAMIC_LICENSE_KEY=aRadLicenseKey42
+STATAMIC_LICENSE_KEY=test-license-key
 ENV, $this->files->get($this->envPath));
     }
 
@@ -279,12 +279,12 @@ public function commented_non_empty_license_key_still_prompts_and_gets_replaced(
 
         $this
             ->artisan('statamic:pro:enable')
-            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'aRadLicenseKey42');
+            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'test-license-key');
 
         $this->assertEquals(<<<'ENV'
 APP_NAME=Statamic
 STATAMIC_PRO_ENABLED=true
-STATAMIC_LICENSE_KEY=aRadLicenseKey42
+STATAMIC_LICENSE_KEY=test-license-key
 ENV, $this->files->get($this->envPath));
     }
 
@@ -314,47 +314,15 @@ public function it_can_set_license_key_via_option()
     {
         $this
             ->artisan('statamic:pro:enable', [
-                '--license-key' => 'aRadLicenseKey42',
+                '--license-key' => 'test-license-key',
                 '--no-interaction' => true,
             ]);
 
         $this->assertEquals(<<<'ENV'
 APP_NAME=Statamic
 STATAMIC_PRO_ENABLED=true
-STATAMIC_LICENSE_KEY=aRadLicenseKey42
-ENV, $this->files->get($this->envPath));
-        $this->assertEquals('aRadLicenseKey42', config('statamic.system.license_key'));
-    }
-
-    #[Test]
-    public function it_rejects_invalid_license_key_via_option()
-    {
-        $this
-            ->artisan('statamic:pro:enable', [
-                '--license-key' => 'not-a-valid-key',
-                '--no-interaction' => true,
-            ])
-            ->expectsOutputToContain('Invalid license key');
-
-        $this->assertEquals(<<<'ENV'
-APP_NAME=Statamic
-STATAMIC_PRO_ENABLED=true
-STATAMIC_LICENSE_KEY=
-ENV, $this->files->get($this->envPath));
-    }
-
-    #[Test]
-    public function it_rejects_invalid_license_key_from_prompt()
-    {
-        $this
-            ->artisan('statamic:pro:enable')
-            ->expectsQuestion('If you have a Statamic license key, paste it now (leave blank to add later)', 'not-a-valid-key')
-            ->expectsOutputToContain('Invalid license key');
-
-        $this->assertEquals(<<<'ENV'
-APP_NAME=Statamic
-STATAMIC_PRO_ENABLED=true
-STATAMIC_LICENSE_KEY=
+STATAMIC_LICENSE_KEY=test-license-key
 ENV, $this->files->get($this->envPath));
+        $this->assertEquals('test-license-key', config('statamic.system.license_key'));
     }
 }

From 11ddfaa9572642536ed55bfdeb5f40b2d70afbc4 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2026 11:23:28 -0400
Subject: [PATCH 5/5] Extract Enable Pro modal and controller

Move the enable-pro modal into a reusable EnableProModal component and the
endpoint into a dedicated EnableProController, decoupling the feature from the
dashboard so it can be reused elsewhere (e.g. the licensing page).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../js/components/modals/EnableProModal.vue   | 120 ++++++++++++++++++
 resources/js/pages/Dashboard.vue              | 110 +---------------
 routes/cp.php                                 |   3 +-
 .../Controllers/CP/DashboardController.php    |  60 +--------
 .../Controllers/CP/EnableProController.php    |  68 ++++++++++
 5 files changed, 198 insertions(+), 163 deletions(-)
 create mode 100644 resources/js/components/modals/EnableProModal.vue
 create mode 100644 src/Http/Controllers/CP/EnableProController.php

diff --git a/resources/js/components/modals/EnableProModal.vue b/resources/js/components/modals/EnableProModal.vue
new file mode 100644
index 00000000000..9897b537cba
--- /dev/null
+++ b/resources/js/components/modals/EnableProModal.vue
@@ -0,0 +1,120 @@
+<script setup>
+import { computed, ref, watch } from 'vue';
+import { router } from '@inertiajs/vue3';
+import { Modal, ModalClose, Button, Field, Input, ErrorMessage } from '@ui';
+
+const props = defineProps({
+    url: { type: String, required: true },
+    hasLicenseKey: Boolean,
+});
+
+const emit = defineEmits(['enabled']);
+
+const open = defineModel('open', { type: Boolean, default: false });
+
+const enablingPro = ref(false);
+const licenseKey = ref('');
+const licenseKeyError = ref(null);
+
+watch(open, (isOpen) => {
+    if (!isOpen) {
+        licenseKey.value = '';
+        licenseKeyError.value = null;
+    }
+});
+
+const trimmedLicenseKey = computed(() => licenseKey.value.trim());
+
+function validateLicenseKey() {
+    if (!trimmedLicenseKey.value && !props.hasLicenseKey) {
+        licenseKeyError.value = __('statamic::messages.enable_pro_license_key_required');
+        return false;
+    }
+
+    licenseKeyError.value = null;
+    return true;
+}
+
+function enablePro() {
+    if (!validateLicenseKey()) {
+        return;
+    }
+
+    enablingPro.value = true;
+
+    router.post(props.url, {
+        license_key: trimmedLicenseKey.value || null,
+    }, {
+        onSuccess: () => {
+            open.value = false;
+            emit('enabled');
+        },
+        onError: (errors) => {
+            licenseKeyError.value = Array.isArray(errors.license_key)
+                ? errors.license_key[0]
+                : errors.license_key;
+        },
+        onFinish: () => {
+            enablingPro.value = false;
+        },
+    });
+}
+</script>
+
+<template>
+    <Modal
+        v-model:open="open"
+        :title="__('Enable Statamic Pro')"
+        :dismissible="!enablingPro"
+        blur
+    >
+        <div class="space-y-4">
+            <p class="text-gray-700 dark:text-gray-200 antialiased">
+                {{ __('statamic::messages.enable_pro_license_required') }}
+            </p>
+
+            <div v-if="!hasLicenseKey" class="space-y-2" @keydown.enter="enablePro">
+                <Field
+                    :instructions="__('statamic::messages.enable_pro_license_key_instructions')"
+                    instructions-below
+                >
+                    <Input
+                        v-model="licenseKey"
+                        name="license_key"
+                        autocomplete="off"
+                        spellcheck="false"
+                        :placeholder="__('Enter License Key')"
+                        :disabled="enablingPro"
+                    />
+                    <ErrorMessage v-if="licenseKeyError" :text="licenseKeyError" class="mt-2" />
+                </Field>
+            </div>
+
+            <p
+                v-else
+                class="text-sm text-gray-600 dark:text-gray-400 antialiased"
+            >
+                {{ __('A license key is already configured for this site.') }}
+            </p>
+        </div>
+
+        <template #footer>
+            <div class="flex items-center justify-end gap-3 pt-3 pb-1">
+                <ModalClose asChild>
+                    <Button
+                        variant="ghost"
+                        :disabled="enablingPro"
+                        :text="__('Cancel')"
+                    />
+                </ModalClose>
+                <Button
+                    variant="primary"
+                    :disabled="enablingPro"
+                    :loading="enablingPro"
+                    :text="__('Enable Pro Mode')"
+                    @click="enablePro"
+                />
+            </div>
+        </template>
+    </Modal>
+</template>
diff --git a/resources/js/pages/Dashboard.vue b/resources/js/pages/Dashboard.vue
index 1c31e01b244..0d038f63de4 100644
--- a/resources/js/pages/Dashboard.vue
+++ b/resources/js/pages/Dashboard.vue
@@ -1,9 +1,9 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
-import { router } from '@inertiajs/vue3';
+import { ref } from 'vue';
 import Head from '@/pages/layout/Head.vue';
 import DynamicHtmlRenderer from '@/components/DynamicHtmlRenderer.vue';
-import { Icon, EmptyStateMenu, EmptyStateItem, DocsCallout, Modal, ModalClose, Button, Field, Input, ErrorMessage } from '@ui';
+import EnableProModal from '@/components/modals/EnableProModal.vue';
+import { Icon, EmptyStateMenu, EmptyStateItem, DocsCallout } from '@ui';
 import useArchitecturalBackground from '@/pages/layout/architectural-background.js';
 
 const props = defineProps({
@@ -20,52 +20,6 @@ const props = defineProps({
 if (props.widgets.length === 0) useArchitecturalBackground();
 
 const confirmingEnablePro = ref(false);
-const enablingPro = ref(false);
-const licenseKey = ref('');
-const licenseKeyError = ref(null);
-
-watch(confirmingEnablePro, (open) => {
-    if (!open) {
-        licenseKey.value = '';
-        licenseKeyError.value = null;
-    }
-});
-
-const trimmedLicenseKey = computed(() => licenseKey.value.trim());
-
-function validateLicenseKey() {
-    if (!trimmedLicenseKey.value && !props.hasLicenseKey) {
-        licenseKeyError.value = __('statamic::messages.enable_pro_license_key_required');
-        return false;
-    }
-
-    licenseKeyError.value = null;
-    return true;
-}
-
-function enablePro() {
-    if (!validateLicenseKey()) {
-        return;
-    }
-
-    enablingPro.value = true;
-
-    router.post(props.enableProUrl, {
-        license_key: trimmedLicenseKey.value || null,
-    }, {
-        onSuccess: () => {
-            confirmingEnablePro.value = false;
-        },
-        onError: (errors) => {
-            licenseKeyError.value = Array.isArray(errors.license_key)
-                ? errors.license_key[0]
-                : errors.license_key;
-        },
-        onFinish: () => {
-            enablingPro.value = false;
-        },
-    });
-}
 
 function classes(widget) {
     return `${widget.classes} ${tailwindWidthClass(widget.width)}`;
@@ -158,61 +112,11 @@ function tailwindWidthClass(width) {
             />
         </EmptyStateMenu>
 
-        <Modal
+        <EnableProModal
             v-model:open="confirmingEnablePro"
-            :title="__('Enable Statamic Pro')"
-            :dismissible="!enablingPro"
-            blur
-        >
-            <div class="space-y-4">
-                <p class="text-gray-700 dark:text-gray-200 antialiased">
-                    {{ __('statamic::messages.enable_pro_license_required') }}
-                </p>
-
-                <div v-if="!hasLicenseKey" class="space-y-2" @keydown.enter="enablePro">
-                    <Field
-                        :instructions="__('statamic::messages.enable_pro_license_key_instructions')"
-                        instructions-below
-                    >
-                        <Input
-                            v-model="licenseKey"
-                            name="license_key"
-                            autocomplete="off"
-                            spellcheck="false"
-                            :placeholder="__('Enter License Key')"
-                            :disabled="enablingPro"
-                        />
-                        <ErrorMessage v-if="licenseKeyError" :text="licenseKeyError" class="mt-2" />
-                    </Field>
-                </div>
-
-                <p
-                    v-else
-                    class="text-sm text-gray-600 dark:text-gray-400 antialiased"
-                >
-                    {{ __('A license key is already configured for this site.') }}
-                </p>
-            </div>
-
-            <template #footer>
-                <div class="flex items-center justify-end gap-3 pt-3 pb-1">
-                    <ModalClose asChild>
-                        <Button
-                            variant="ghost"
-                            :disabled="enablingPro"
-                            :text="__('Cancel')"
-                        />
-                    </ModalClose>
-                    <Button
-                        variant="primary"
-                        :disabled="enablingPro"
-                        :loading="enablingPro"
-                        :text="__('Enable Pro Mode')"
-                        @click="enablePro"
-                    />
-                </div>
-            </template>
-        </Modal>
+            :url="enableProUrl"
+            :has-license-key="hasLicenseKey"
+        />
     </template>
 
     <DocsCallout :topic="__('Widgets')" url="widgets" />
diff --git a/routes/cp.php b/routes/cp.php
index d4fde85593e..d26f259e127 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -50,6 +50,7 @@
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Http\Controllers\CP\DashboardController;
 use Statamic\Http\Controllers\CP\DuplicatesController;
+use Statamic\Http\Controllers\CP\EnableProController;
 use Statamic\Http\Controllers\CP\FieldActionModalController;
 use Statamic\Http\Controllers\CP\Fields\AdditionalBlueprintController;
 use Statamic\Http\Controllers\CP\Fields\BlueprintController;
@@ -162,7 +163,7 @@
 
     Route::get('/', StartPageController::class)->name('index');
     Route::get('dashboard', [DashboardController::class, 'index'])->name('dashboard');
-    Route::post('dashboard/enable-pro', [DashboardController::class, 'enablePro'])->name('dashboard.enable-pro');
+    Route::post('enable-pro', EnableProController::class)->name('enable-pro');
 
     Route::get('select-site/{handle}', [SelectSiteController::class, 'select']);
 
diff --git a/src/Http/Controllers/CP/DashboardController.php b/src/Http/Controllers/CP/DashboardController.php
index 890196bd657..2e1ce1bfc18 100644
--- a/src/Http/Controllers/CP/DashboardController.php
+++ b/src/Http/Controllers/CP/DashboardController.php
@@ -2,20 +2,14 @@
 
 namespace Statamic\Http\Controllers\CP;
 
-use Illuminate\Http\Request;
-use Illuminate\Validation\ValidationException;
 use Inertia\Inertia;
-use Statamic\Exceptions\AuthorizationException;
 use Statamic\Facades\Preference;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
-use Statamic\Licensing\LicenseManager;
 use Statamic\Statamic;
 use Statamic\Support\Arr;
 use Statamic\Widgets\Loader;
 
-use function Statamic\trans as __;
-
 class DashboardController extends CpController
 {
     /**
@@ -33,65 +27,13 @@ public function index(Loader $loader)
             'pro' => Statamic::pro(),
             'canEnablePro' => User::current()->isSuper(),
             'hasLicenseKey' => $hasLicenseKey,
-            'enableProUrl' => cp_route('dashboard.enable-pro'),
+            'enableProUrl' => cp_route('enable-pro'),
             'blueprintsUrl' => cp_route('blueprints.index'),
             'collectionsCreateUrl' => cp_route('collections.create'),
             'navigationCreateUrl' => cp_route('navigation.create'),
         ]);
     }
 
-    public function enablePro(Request $request, LicenseManager $licenses)
-    {
-        if (! User::current()->isSuper()) {
-            throw new AuthorizationException;
-        }
-
-        $hasLicenseKey = filled(config('statamic.system.license_key'));
-        $licenseKey = trim((string) $request->input('license_key', ''));
-
-        $request->merge([
-            'license_key' => $licenseKey !== '' ? $licenseKey : null,
-        ]);
-
-        $request->validate([
-            'license_key' => [
-                $hasLicenseKey ? 'nullable' : 'required',
-                'string',
-            ],
-        ], [
-            'license_key.required' => __('statamic::messages.enable_pro_license_key_required'),
-        ]);
-
-        if ($licenseKey !== '') {
-            $this->validateLicenseKeyWithOutpost($licenses, $licenseKey);
-        }
-
-        Statamic::enablePro($licenseKey !== '' ? $licenseKey : null);
-
-        return back()->withSuccess(__('Statamic Pro enabled'));
-    }
-
-    private function validateLicenseKeyWithOutpost(LicenseManager $licenses, string $licenseKey): void
-    {
-        config(['statamic.system.license_key' => $licenseKey]);
-
-        $licenses->refresh();
-
-        if ($licenses->outpostIsOffline() || $licenses->requestFailed()) {
-            throw ValidationException::withMessages([
-                'license_key' => $licenses->requestFailureMessage(),
-            ]);
-        }
-
-        $reason = Arr::get($licenses->site()->response() ?? [], 'reason');
-
-        if ($reason === 'unknown_site' || $licenses->site()->response() === null) {
-            throw ValidationException::withMessages([
-                'license_key' => __('statamic::messages.enable_pro_license_key_invalid'),
-            ]);
-        }
-    }
-
     /**
      * Get displayable widgets.
      *
diff --git a/src/Http/Controllers/CP/EnableProController.php b/src/Http/Controllers/CP/EnableProController.php
new file mode 100644
index 00000000000..ed8dfc47df0
--- /dev/null
+++ b/src/Http/Controllers/CP/EnableProController.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP;
+
+use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
+use Statamic\Exceptions\AuthorizationException;
+use Statamic\Facades\User;
+use Statamic\Licensing\LicenseManager;
+use Statamic\Statamic;
+use Statamic\Support\Arr;
+
+use function Statamic\trans as __;
+
+class EnableProController extends CpController
+{
+    public function __invoke(Request $request, LicenseManager $licenses)
+    {
+        if (! User::current()->isSuper()) {
+            throw new AuthorizationException;
+        }
+
+        $hasLicenseKey = filled(config('statamic.system.license_key'));
+        $licenseKey = trim((string) $request->input('license_key', ''));
+
+        $request->merge([
+            'license_key' => $licenseKey !== '' ? $licenseKey : null,
+        ]);
+
+        $request->validate([
+            'license_key' => [
+                $hasLicenseKey ? 'nullable' : 'required',
+                'string',
+            ],
+        ], [
+            'license_key.required' => __('statamic::messages.enable_pro_license_key_required'),
+        ]);
+
+        if ($licenseKey !== '') {
+            $this->validateLicenseKeyWithOutpost($licenses, $licenseKey);
+        }
+
+        Statamic::enablePro($licenseKey !== '' ? $licenseKey : null);
+
+        return back()->withSuccess(__('Statamic Pro enabled'));
+    }
+
+    private function validateLicenseKeyWithOutpost(LicenseManager $licenses, string $licenseKey): void
+    {
+        config(['statamic.system.license_key' => $licenseKey]);
+
+        $licenses->refresh();
+
+        if ($licenses->outpostIsOffline() || $licenses->requestFailed()) {
+            throw ValidationException::withMessages([
+                'license_key' => $licenses->requestFailureMessage(),
+            ]);
+        }
+
+        $reason = Arr::get($licenses->site()->response() ?? [], 'reason');
+
+        if ($reason === 'unknown_site' || $licenses->site()->response() === null) {
+            throw ValidationException::withMessages([
+                'license_key' => __('statamic::messages.enable_pro_license_key_invalid'),
+            ]);
+        }
+    }
+}