diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index a91be70e..e1b6387a 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -63,9 +63,9 @@
                                 <div class="container-fluid px-0">
                                     <div class="row g-0 mb-2">
                                         <div class="col-4">
-                                            @if (context.LogoFileId != null)
+                                            @if (context.LogoUrl != null)
                                             {
-                                                <img src="@GetLogo(context.LogoFileId.Value)" class="img-fluid" alt="@context.Name" />
+                                                <img src="@context.LogoUrl" class="img-fluid" alt="@context.Name" />
                                             }
                                             else
                                             {
@@ -210,13 +210,6 @@
         HideProgressIndicator();
     }
 
-    private string GetLogo(int fileid)
-    {
-        var url = ImageUrl(fileid, 100, 100);
-        url = (!string.IsNullOrEmpty(PageState.Alias.Path)) ? url.Substring(PageState.Alias.Path.Length + 1) : url;
-        return Constants.PackageRegistryUrl + url;
-    }
-
     private async void PriceChanged(string price)
     {
         _price = price;
diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index c27f9282..7063a084 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -133,12 +133,9 @@
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="packageservice" HelpText="Specify If The Package Service Is Enabled For Installing Modules, Themes, And Translations" ResourceKey="PackageService">Enable Package Service? </Label>
+                <Label Class="col-sm-3" For="packageregistryurl" HelpText="Specify The Package Manager Service For Installing Modules, Themes, And Translations. If This Field Is Blank It Means The Package Manager Service Is Disabled For This Installation." ResourceKey="PackageManager">Package Manager: </Label>
                 <div class="col-sm-9">
-                    <select id="packageservice" class="form-select" @bind="@_packageservice">
-                        <option value="true">@SharedLocalizer["True"]</option>
-                        <option value="false">@SharedLocalizer["False"]</option>
-                    </select>
+                    <input id="packageregistryurl" class="form-control" @bind="@_packageregistryurl" />
                 </div>
             </div>
         </div>
@@ -182,7 +179,7 @@
 	private string _logginglevel = string.Empty;
 	private string _notificationlevel = string.Empty;
 	private string _swagger = string.Empty;
-	private string _packageservice = string.Empty;
+    private string _packageregistryurl = string.Empty;
 
 	private string _log = string.Empty;
 
@@ -213,7 +210,7 @@
 			_logginglevel = systeminfo["Logging:LogLevel:Default"].ToString();
 			_notificationlevel = systeminfo["Logging:LogLevel:Notify"].ToString();
 			_swagger = systeminfo["UseSwagger"].ToString();
-			_packageservice = systeminfo["PackageService"].ToString();
+            _packageregistryurl = systeminfo["PackageRegistryUrl"].ToString();
 		}
 
 		systeminfo = await SystemService.GetSystemInfoAsync("log");
@@ -232,7 +229,7 @@
 			settings.Add("Logging:LogLevel:Default", _logginglevel);
 			settings.Add("Logging:LogLevel:Notify", _notificationlevel);
 			settings.Add("UseSwagger", _swagger);
-			settings.Add("PackageService", _packageservice);
+			settings.Add("PackageRegistryUrl", _packageregistryurl);
 			await SystemService.UpdateSystemInfoAsync(settings);
 			AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success);
 		}
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index 33dcac03..03a973ca 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -63,9 +63,9 @@
                                 <div class="container-fluid px-0">
                                     <div class="row g-0 mb-2">
                                         <div class="col-4">
-                                            @if (context.LogoFileId != null)
+                                            @if (context.LogoUrl != null)
                                             {
-                                                <img src="@GetLogo(context.LogoFileId.Value)" class="img-fluid" alt="@context.Name" />
+                                                <img src="@context.LogoUrl" class="img-fluid" alt="@context.Name" />
                                             }
                                             else
                                             {
@@ -212,13 +212,6 @@
         HideProgressIndicator();
     }
 
-    private string GetLogo(int fileid)
-    {
-        var url = ImageUrl(fileid, 100, 100);
-        url = (!string.IsNullOrEmpty(PageState.Alias.Path)) ? url.Substring(PageState.Alias.Path.Length + 1) : url;
-        return Constants.PackageRegistryUrl + url;
-    }
-
     private async void PriceChanged(string price)
     {
         _price = price;
diff --git a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
index c5c328cd..0c433d3e 100644
--- a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
@@ -213,17 +213,17 @@
   <data name="Log.Heading" xml:space="preserve">
     <value>Log</value>
   </data>
-    <data name="Register" xml:space="preserve">
+  <data name="Register" xml:space="preserve">
     <value>Please Register Me For Major Product Updates And Security Bulletins</value>
   </data>
   <data name="Success.Register" xml:space="preserve">
     <value>You Have Been Successfully Registered For Updates</value>
   </data>
-  <data name="PackageService.HelpText" xml:space="preserve">
-    <value>Specify If The Package Service Is Enabled For Installing Modules, Themes, And Translations</value>
+  <data name="PackageManager.HelpText" xml:space="preserve">
+    <value>Specify The Package Manager Service For Installing Modules, Themes, And Translations. If This Field Is Blank It Means The Package Manager Service Is Disabled For This Installation.</value>
   </data>
-  <data name="PackageService.Text" xml:space="preserve">
-    <value>Package Service Enabled?</value>
+  <data name="PackageManager.Text" xml:space="preserve">
+    <value>Package Manager:</value>
   </data>
   <data name="Swagger.HelpText" xml:space="preserve">
     <value>Specify If Swagger Is Enabled For Your Server API</value>
diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs
index 5c439835..1e4c8716 100644
--- a/Oqtane.Server/Controllers/InstallationController.cs
+++ b/Oqtane.Server/Controllers/InstallationController.cs
@@ -7,9 +7,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Oqtane.Infrastructure;
 using Oqtane.Models;
-using Oqtane.Modules;
 using Oqtane.Shared;
-using Oqtane.Themes;
 using Microsoft.Extensions.Caching.Memory;
 using System.Net;
 using Oqtane.Repository;
@@ -244,12 +242,15 @@ namespace Oqtane.Controllers
         {
             try
             {
-                using (var client = new HttpClient())
+                var url = _configManager.GetSetting("PackageRegistryUrl", Constants.PackageRegistryUrl);
+                if (!string.IsNullOrEmpty(url))
                 {
-                    client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
-                    client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
-                    Uri uri = new Uri(Constants.PackageRegistryUrl + $"/api/registry/contact/?id={_configManager.GetInstallationId()}&email={WebUtility.UrlEncode(email)}");
-                    var response = await client.GetAsync(uri).ConfigureAwait(false);
+                    using (var client = new HttpClient())
+                    {
+                        client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
+                        client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
+                        var response = await client.GetAsync(new Uri(url + $"/api/registry/contact/?id={_configManager.GetInstallationId()}&email={WebUtility.UrlEncode(email)}")).ConfigureAwait(false);
+                    }
                 }
             }
             catch
diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs
index 4af636f4..56cd161b 100644
--- a/Oqtane.Server/Controllers/PackageController.cs
+++ b/Oqtane.Server/Controllers/PackageController.cs
@@ -38,14 +38,15 @@ namespace Oqtane.Controllers
         {
             // get packages
             List<Package> packages = new List<Package>();
-            if (bool.Parse(_configManager.GetSetting("PackageService", "true")) == true)
+            var url = _configManager.GetSetting("PackageRegistryUrl", Constants.PackageRegistryUrl);
+            if (!string.IsNullOrEmpty(url))
             {
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
                     client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
-                    packages = await GetJson<List<Package>>(client, Constants.PackageRegistryUrl + $"/api/registry/packages/?id={_configManager.GetInstallationId()}&type={type.ToLower()}&version={Constants.Version}&search={search}&price={price}&package={package}&sort={sort}");
-                 }
+                    packages = await GetJson<List<Package>>(client, url + $"/api/registry/packages/?id={_configManager.GetInstallationId()}&type={type.ToLower()}&version={Constants.Version}&search={search}&price={price}&package={package}&sort={sort}");
+                }
             }
             return packages;
         }
@@ -56,14 +57,15 @@ namespace Oqtane.Controllers
         {
             // get package info
             Package package = null;
-            if (bool.Parse(_configManager.GetSetting("PackageService", "true")) == true)
+            var url = _configManager.GetSetting("PackageRegistryUrl", Constants.PackageRegistryUrl);
+            if (!string.IsNullOrEmpty(url))
             {
                 var download = (string.IsNullOrEmpty(folder)) ? "false" : "true";
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
                     client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
-                    package = await GetJson<Package>(client, Constants.PackageRegistryUrl + $"/api/registry/package/?id={_configManager.GetInstallationId()}&package={packageid}&version={version}&download={download}");
+                    package = await GetJson<Package>(client, url + $"/api/registry/package/?id={_configManager.GetInstallationId()}&package={packageid}&version={version}&download={download}");
                 }
 
                 if (package != null)
diff --git a/Oqtane.Server/Controllers/SystemController.cs b/Oqtane.Server/Controllers/SystemController.cs
index 051e3d52..471fd81e 100644
--- a/Oqtane.Server/Controllers/SystemController.cs
+++ b/Oqtane.Server/Controllers/SystemController.cs
@@ -52,7 +52,7 @@ namespace Oqtane.Controllers
                     systeminfo.Add("Logging:LogLevel:Default", _configManager.GetSetting("Logging:LogLevel:Default", "Information"));
                     systeminfo.Add("Logging:LogLevel:Notify", _configManager.GetSetting("Logging:LogLevel:Notify", "Error"));
                     systeminfo.Add("UseSwagger", _configManager.GetSetting("UseSwagger", "true"));
-                    systeminfo.Add("PackageService", _configManager.GetSetting("PackageService", "true"));
+                    systeminfo.Add("PackageRegistryUrl", _configManager.GetSetting("PackageRegistryUrl", Constants.PackageRegistryUrl));
                     break;
                 case "log":
                     string log = "";
diff --git a/Oqtane.Shared/Models/Package.cs b/Oqtane.Shared/Models/Package.cs
index 1e424744..21100674 100644
--- a/Oqtane.Shared/Models/Package.cs
+++ b/Oqtane.Shared/Models/Package.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Oqtane.Models
 {
@@ -37,6 +38,12 @@ namespace Oqtane.Models
         /// </summary>
         public int? LogoFileId { get; set; }
 
+        /// <summary>
+        /// logo
+        /// </summary>
+        [NotMapped]
+        public string LogoUrl { get; set; }
+
         /// <summary>
         /// License for the Package. 
         /// </summary>