diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index 48dc3ab993..61e57f617e 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -68,9 +68,13 @@
Version |
{{.Runner.Version}} |
+
+ | Type |
+ {{.Runner.BelongsToOwnerType.LocaleString ctx.Locale}} |
+
| Owner |
- {{.Runner.BelongsToOwnerType.LocaleString ctx.Locale}} |
+ {{if .Runner.BelongsToOwnerName}}{{.Runner.BelongsToOwnerName}}{{else}}System{{end}} |
| Labels |
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl
index 43321a8dc5..b4e9b84c48 100644
--- a/templates/shared/actions/runner_list.tmpl
+++ b/templates/shared/actions/runner_list.tmpl
@@ -10,7 +10,7 @@