diff --git a/packages/api/src/controllers/config.js b/packages/api/src/controllers/config.js
index f26eaae23..161af17d4 100644
--- a/packages/api/src/controllers/config.js
+++ b/packages/api/src/controllers/config.js
@@ -64,6 +64,7 @@ module.exports = {
       isDocker: platformInfo.isDocker,
       isElectron: platformInfo.isElectron,
       isLicenseValid,
+      isLicenseExpired: checkedLicense?.isExpired,
       checkedLicense,
       configurationError,
       logoutUrl: await authProvider.getLogoutUrl(),
diff --git a/packages/tools/src/stringTools.ts b/packages/tools/src/stringTools.ts
index b77570735..1c254c1a2 100644
--- a/packages/tools/src/stringTools.ts
+++ b/packages/tools/src/stringTools.ts
@@ -500,3 +500,12 @@ export function extractErrorLogData(err, additionalFields = {}) {
     ...additionalFields,
   };
 }
+
+export function safeFormatDate(date) {
+  try {
+    const v = new Date(date);
+    return v.toISOString().substring(0, 10);
+  } catch (e) {
+    return date?.toString();
+  }
+}
diff --git a/packages/web/src/EnterLicensePage.svelte b/packages/web/src/EnterLicensePage.svelte
index 85ee885be..8469304db 100644
--- a/packages/web/src/EnterLicensePage.svelte
+++ b/packages/web/src/EnterLicensePage.svelte
@@ -12,11 +12,20 @@
   import { apiCall } from './utility/api';
   import FormStyledButton from './buttons/FormStyledButton.svelte';
   import getElectron from './utility/getElectron';
+  import { openWebLink } from './utility/exportFileTools';
 
   const config = useConfig();
   const values = writable({ amoid: null, databaseServer: null });
 
+  $: isExpired = $config?.isLicenseExpired;
+
   let errorMessage = '';
+  let expiredMessageSet = false;
+
+  $: if (isExpired && !expiredMessageSet) {
+    errorMessage = 'Your license is expired';
+    expiredMessageSet = true;
+  }
 
   onMount(() => {
     const removed = document.getElementById('starting_dbgate_zero');
@@ -50,17 +59,28 @@
           />
         </div>
 
+        {#if !isExpired}
+          <div class="submit">
+            <FormStyledButton
+              value="Start 30-day trial"
+              on:click={async e => {
+                errorMessage = '';
+                const license = await apiCall('config/start-trial');
+                if (license?.status == 'ok') {
+                  internalRedirectTo('/index.html');
+                } else {
+                  errorMessage = license?.errorMessage || 'Error starting trial';
+                }
+              }}
+            />
+          </div>
+        {/if}
+
         <div class="submit">
           <FormStyledButton
-            value="Start 30-day trial"
+            value="Purchase DbGate Premium"
             on:click={async e => {
-              errorMessage = '';
-              const license = await apiCall('config/start-trial');
-              if (license?.status == 'ok') {
-                internalRedirectTo('/index.html');
-              } else {
-                errorMessage = license?.errorMessage || 'Error starting trial';
-              }
+              openWebLink('https://auth.dbgate.eu/create-checkout-session-simple');
             }}
           />
         </div>
@@ -81,9 +101,8 @@
         {/if}
 
         <div class="purchase-info">
-          If you want to purchase Premium license, please contact us at <Link href="mailto:sales@dbgate.eu"
-            >sales@dbgate.eu</Link
-          >
+          For more info about DbGate licensing, you could visit <Link href="https://dbgate.eu/">dbgate.eu</Link> web or contact
+          us at <Link href="mailto:sales@dbgate.eu">sales@dbgate.eu</Link>
         </div>
       </div>
     </div>
diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index 6b36c9421..45ffc7fac 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -36,6 +36,7 @@
   import { apiCall } from '../utility/api';
   import { useSettings } from '../utility/metadataLoaders';
   import { derived } from 'svelte/store';
+  import { safeFormatDate } from 'dbgate-tools';
 
   const electron = getElectron();
   let restartWarning = false;
@@ -372,10 +373,14 @@ ORDER BY
                 <div>
                   <FontIcon icon="img ok" /> License key is valid
                 </div>
-                <div>
-                  License valid to: {licenseKeyCheckResult.validTo}
-                </div>
-                <div>License key expiration: {licenseKeyCheckResult.expiration}</div>
+                {#if licenseKeyCheckResult.validTo}
+                  <div>
+                    License valid to: {licenseKeyCheckResult.validTo}
+                  </div>
+                {/if}
+                {#if licenseKeyCheckResult.expiration}
+                  <div>License key expiration: <b>{safeFormatDate(licenseKeyCheckResult.expiration)}</b></div>
+                {/if}
               {:else if licenseKeyCheckResult.status == 'error'}
                 <FontIcon icon="img error" /> License key is invalid
               {/if}