diff --git a/source/script.php b/source/script.php
index d515031..674566c 100644
--- a/source/script.php
+++ b/source/script.php
@@ -15,86 +15,148 @@ use Joomla\CMS\Language\Text;
 
 class Pkg_MokoOGInstallerScript
 {
-    /**
-     * Minimum Joomla version required
-     *
-     * @var string
-     */
-    protected $minimumJoomla = '4.0.0';
+	protected $minimumJoomla = '4.0.0';
+	protected $minimumPhp = '8.1.0';
 
-    /**
-     * Minimum PHP version required
-     *
-     * @var string
-     */
-    protected $minimumPhp = '8.1.0';
+	/** @var array Download keys saved before Joomla wipes update sites */
+	private array $savedDownloadKeys = [];
 
-    /**
-     * Called before any install/update/uninstall action.
-     *
-     * @param   string            $type    Action type (install, update, uninstall)
-     * @param   InstallerAdapter  $parent  Installer adapter
-     *
-     * @return  bool
-     */
-    public function preflight(string $type, InstallerAdapter $parent): bool
-    {
-        if (version_compare(PHP_VERSION, $this->minimumPhp, '<')) {
-            Factory::getApplication()->enqueueMessage(
-                Text::sprintf('PKG_MOKOOG_PHP_VERSION_ERROR', $this->minimumPhp),
-                'error'
-            );
+	public function preflight(string $type, InstallerAdapter $parent): bool
+	{
+		if (version_compare(PHP_VERSION, $this->minimumPhp, '<'))
+		{
+			Factory::getApplication()->enqueueMessage(
+				Text::sprintf('PKG_MOKOOG_PHP_VERSION_ERROR', $this->minimumPhp),
+				'error'
+			);
 
-            return false;
-        }
+			return false;
+		}
 
-        return true;
-    }
+		$this->savedDownloadKeys = $this->backupDownloadKeys();
 
-    /**
-     * Called after install/update.
-     *
-     * @param   string            $type    Action type
-     * @param   InstallerAdapter  $parent  Installer adapter
-     *
-     * @return  void
-     */
-    public function postflight(string $type, InstallerAdapter $parent): void
-    {
-        if ($type === 'install') {
-            // Enable the system plugin automatically on fresh install
-            $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
-                ->update($db->quoteName('#__extensions'))
-                ->set($db->quoteName('enabled') . ' = 1')
-                ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-                ->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
-                ->where($db->quoteName('element') . ' = ' . $db->quote('mokoog'));
+		return true;
+	}
 
-            $db->setQuery($query);
-            $db->execute();
+	public function postflight(string $type, InstallerAdapter $parent): void
+	{
+		$this->restoreDownloadKeys($this->savedDownloadKeys);
+		$this->warnMissingLicenseKey();
 
-            // Enable the content plugin automatically
-            $query = $db->getQuery(true)
-                ->update($db->quoteName('#__extensions'))
-                ->set($db->quoteName('enabled') . ' = 1')
-                ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-                ->where($db->quoteName('folder') . ' = ' . $db->quote('content'))
-                ->where($db->quoteName('element') . ' = ' . $db->quote('mokoog'));
+		if ($type === 'install')
+		{
+			$db = Factory::getDbo();
 
-            $db->setQuery($query);
-            $db->execute();
+			foreach (['system', 'content', 'webservices'] as $folder)
+			{
+				$db->setQuery(
+					$db->getQuery(true)
+						->update($db->quoteName('#__extensions'))
+						->set($db->quoteName('enabled') . ' = 1')
+						->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+						->where($db->quoteName('folder') . ' = ' . $db->quote($folder))
+						->where($db->quoteName('element') . ' = ' . $db->quote('mokoog'))
+				)->execute();
+			}
+		}
+	}
 
-            // Enable the webservices plugin automatically
-            $query = $db->getQuery(true)
-                ->update($db->quoteName('#__extensions'))
-                ->set($db->quoteName('enabled') . ' = 1')
-                ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-                ->where($db->quoteName('folder') . ' = ' . $db->quote('webservices'))
-                ->where($db->quoteName('element') . ' = ' . $db->quote('mokoog'));
+	private function backupDownloadKeys(): array
+	{
+		$keys = [];
 
-            $db->setQuery($query);
-            $db->execute();
-        }
-    }
+		try
+		{
+			$db = Factory::getDbo();
+			$db->setQuery(
+				$db->getQuery(true)
+					->select(['us.' . $db->quoteName('update_site_id'), 'us.' . $db->quoteName('extra_query'), 'us.' . $db->quoteName('location'), 'e.' . $db->quoteName('element')])
+					->from($db->quoteName('#__update_sites', 'us'))
+					->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON us.update_site_id = use.update_site_id')
+					->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
+					->where($db->quoteName('us.extra_query') . ' != ' . $db->quote(''))
+			);
+
+			foreach ($db->loadObjectList() ?: [] as $row)
+			{
+				$keys['elem_' . $row->element] = $row->extra_query;
+				$keys[$row->location] = $row->extra_query;
+				$keys['id_' . $row->update_site_id] = $row->extra_query;
+			}
+		}
+		catch (\Throwable $e) {}
+
+		return $keys;
+	}
+
+	private function restoreDownloadKeys(array $savedKeys): void
+	{
+		if (empty($savedKeys)) { return; }
+
+		try
+		{
+			$db = Factory::getDbo();
+			$db->setQuery(
+				$db->getQuery(true)
+					->select(['us.' . $db->quoteName('update_site_id'), 'us.' . $db->quoteName('extra_query'), 'us.' . $db->quoteName('location'), 'e.' . $db->quoteName('element')])
+					->from($db->quoteName('#__update_sites', 'us'))
+					->join('LEFT', $db->quoteName('#__update_sites_extensions', 'use') . ' ON us.update_site_id = use.update_site_id')
+					->join('LEFT', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
+					->where('(' . $db->quoteName('us.extra_query') . ' = ' . $db->quote('') . ' OR ' . $db->quoteName('us.extra_query') . ' NOT LIKE ' . $db->quote('%dlid=%') . ')')
+			);
+
+			$restored = 0;
+
+			foreach ($db->loadObjectList() ?: [] as $site)
+			{
+				$element = (string) ($site->element ?? '');
+				$key = ($element !== '') ? ($savedKeys['elem_' . $element] ?? '') : '';
+				if (empty($key)) { $key = $savedKeys[$site->location] ?? $savedKeys['id_' . $site->update_site_id] ?? ''; }
+
+				if (!empty($key))
+				{
+					$db->setQuery($db->getQuery(true)->update($db->quoteName('#__update_sites'))->set($db->quoteName('extra_query') . ' = ' . $db->quote($key))->where($db->quoteName('update_site_id') . ' = ' . (int) $site->update_site_id))->execute();
+					$restored++;
+				}
+			}
+
+			if ($restored > 0) { Factory::getApplication()->enqueueMessage(sprintf('Restored %d download key(s).', $restored), 'message'); }
+		}
+		catch (\Throwable $e) {}
+	}
+
+	private function warnMissingLicenseKey(): void
+	{
+		try
+		{
+			$db = Factory::getDbo();
+			$db->setQuery(
+				$db->getQuery(true)
+					->select([$db->quoteName('update_site_id'), $db->quoteName('extra_query')])
+					->from($db->quoteName('#__update_sites'))
+					->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoJoomOpenGraph%') . ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoJoomOpenGraph%') . ')')
+					->setLimit(1)
+			);
+			$site = $db->loadObject();
+
+			if ($site)
+			{
+				$eq = (string) ($site->extra_query ?? '');
+				if (!empty($eq) && strpos($eq, 'dlid=') !== false) { parse_str($eq, $p); if (!empty($p['dlid'])) { return; } }
+				$editUrl = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $site->update_site_id;
+			}
+			else
+			{
+				$editUrl = 'index.php?option=com_installer&view=updatesites';
+			}
+
+			Factory::getApplication()->enqueueMessage(
+				'<strong>Moko Consulting License Key Required</strong> — '
+				. 'No download key is configured. Updates will not be available until a valid license key is entered. '
+				. '<a href="' . $editUrl . '" class="btn btn-sm btn-warning ms-2">Enter License Key</a>',
+				'warning'
+			);
+		}
+		catch (\Throwable $e) {}
+	}
 }