diff --git a/services/updateserver/joomla.go b/services/updateserver/joomla.go
index 039b8f30c8..b65a900903 100644
--- a/services/updateserver/joomla.go
+++ b/services/updateserver/joomla.go
@@ -200,15 +200,14 @@ func GenerateJoomlaXML(ctx context.Context, repo *repo_model.Repository, require
 	if cfg != nil && cfg.ExtensionType != "" {
 		extType = cfg.ExtensionType
 	}
-	maintainer := repo.Owner.Name
-	if cfg != nil && cfg.Maintainer != "" {
-		maintainer = cfg.Maintainer
+	// Maintainer and URL always come from the org profile.
+	maintainer := repo.Owner.FullName
+	if maintainer == "" {
+		maintainer = repo.Owner.Name
 	}
-	maintainerURL := fmt.Sprintf("%s/%s", baseURL, repo.Owner.Name)
-	if cfg != nil && cfg.SupportURL != "" {
-		maintainerURL = cfg.SupportURL
-	} else if cfg != nil && cfg.MaintainerURL != "" {
-		maintainerURL = cfg.MaintainerURL
+	maintainerURL := repo.Owner.Website
+	if maintainerURL == "" {
+		maintainerURL = fmt.Sprintf("%s/%s", baseURL, repo.Owner.Name)
 	}
 	targetVersion := "(5|6)\\..*"
 	if cfg != nil && cfg.TargetVersion != "" {
@@ -318,9 +317,10 @@ func GenerateJoomlaXML(ctx context.Context, repo *repo_model.Repository, require
 			desc = fmt.Sprintf("%s %s build.", displayName, ch)
 		}
 
+		// Info URL: use support_url (product page), fall back to releases page.
 		infoURL := fmt.Sprintf("%s/releases", repoLink)
-		if cfg != nil && cfg.InfoURL != "" {
-			infoURL = cfg.InfoURL
+		if cfg != nil && cfg.SupportURL != "" {
+			infoURL = cfg.SupportURL
 		}
 
 		// Joomla <client> element: only relevant for plugins/modules (site vs administrator).