diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json
index 29c60db3e4..85f2290390 100644
--- a/options/locale/locale_en-US.json
+++ b/options/locale/locale_en-US.json
@@ -206,7 +206,7 @@
 	"filter.string.asc": "A–Z",
 	"filter.string.desc": "Z–A",
 	"error.occurred": "An error occurred",
-	"error.report_message": "If you believe that this is a Gitea bug, please search for issues on <a href=\"%s\" target=\"_blank\">GitHub</a> or open a new issue if necessary.",
+	"error.report_message": "If you believe that this is a GitCaddy bug, please search for issues on <a href=\"%s\" target=\"_blank\">GitCaddy Gitea</a> or open a new issue if necessary.",
 	"error.not_found": "The target couldn't be found.",
 	"error.network_error": "Network error",
 	"startpage.app_desc": "A painless, self-hosted Git service",
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 10f84ce469..105862d8f6 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -33,7 +33,7 @@
 									<div class="content">
 										<div class="header tw-flex tw-items-center tw-gap-2">
 											{{if .Repo.Avatar}}
-												<img class="tw-w-6 tw-h-6 tw-rounded" src="{{.Repo.RelAvatarLink}}" alt="">
+												<img class="tw-w-6 tw-h-6 tw-rounded" src="{{.Repo.RelAvatarLink ctx}}" alt="">
 											{{else}}
 												{{if .Repo.IsPrivate}}{{svg "octicon-lock" 16}}{{else if .Repo.IsFork}}{{svg "octicon-repo-forked" 16}}{{else if .Repo.IsMirror}}{{svg "octicon-mirror" 16}}{{else}}{{svg "octicon-repo" 16}}{{end}}
 											{{end}}
@@ -78,7 +78,7 @@
 										<div class="content">
 											<div class="header tw-flex tw-items-center tw-gap-2">
 												{{if .Repo.Avatar}}
-													<img class="tw-w-6 tw-h-6 tw-rounded" src="{{.Repo.RelAvatarLink}}" alt="">
+													<img class="tw-w-6 tw-h-6 tw-rounded" src="{{.Repo.RelAvatarLink ctx}}" alt="">
 												{{else}}
 													{{if .Repo.IsPrivate}}{{svg "octicon-lock" 16}}{{else if .Repo.IsFork}}{{svg "octicon-repo-forked" 16}}{{else if .Repo.IsMirror}}{{svg "octicon-mirror" 16}}{{else}}{{svg "octicon-repo" 16}}{{end}}
 												{{end}}
@@ -165,7 +165,7 @@
 							<div class="item">
 								<div class="tw-flex tw-items-center tw-gap-3">
 									{{if .Avatar}}
-										<img class="tw-w-8 tw-h-8 tw-rounded" src="{{.RelAvatarLink}}" alt="">
+										<img class="tw-w-8 tw-h-8 tw-rounded" src="{{.RelAvatarLink ctx}}" alt="">
 									{{else}}
 										<div class="tw-w-8 tw-h-8 tw-flex tw-items-center tw-justify-center">
 											{{if .IsPrivate}}{{svg "octicon-lock" 20}}{{else if .IsFork}}{{svg "octicon-repo-forked" 20}}{{else if .IsMirror}}{{svg "octicon-mirror" 20}}{{else}}{{svg "octicon-repo" 20}}{{end}}