diff --git a/wcfsetup/install/files/acp/templates/adAdd.tpl b/wcfsetup/install/files/acp/templates/adAdd.tpl
index 984d35a4f2c..bf7b824e634 100644
--- a/wcfsetup/install/files/acp/templates/adAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/adAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.ad.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.ad.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
index 8b12c3b5d25..42be3945503 100644
--- a/wcfsetup/install/files/acp/templates/articleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.article.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.article.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
index 9a3d11d3f6e..f813b6afdd9 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
@@ -87,7 +87,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.bbcode.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.bbcode.{$action}{/lang}{if $action == 'edit'}: {$bbcode->bbcodeTag}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
index 6fea5075a0d..0bbf38da957 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.bbcode.mediaProvider.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.bbcode.mediaProvider.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index 3400166f6f7..b0de65d5f09 100644
--- a/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@ -65,7 +65,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{if $action == 'add'}{lang}wcf.acp.box.add{/lang}{else}{lang}wcf.acp.box.edit{/lang}{/if}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.box.{$action}{/lang}{if $action == 'edit'}: {$box->name}{/if}</h1>
 	</div>
 
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl b/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
index 974d4458d50..9cce3363085 100644
--- a/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.captcha.question.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.captcha.question.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
index 5df69b5d6f3..b528edecf58 100644
--- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@ -17,7 +17,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{@$objectType->getProcessor()->getLanguageVariable($action)}</h1>
+		<h1 class="contentTitle">{@$objectType->getProcessor()->getLanguageVariable($action)}{if $action == 'edit'}: {$category->getTitle()}{/if}</h1>
 	</div>
 	
 	{hascontent}
diff --git a/wcfsetup/install/files/acp/templates/categoryAddFormBuilder.tpl b/wcfsetup/install/files/acp/templates/categoryAddFormBuilder.tpl
index a5e9262296b..e53a33547a2 100644
--- a/wcfsetup/install/files/acp/templates/categoryAddFormBuilder.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAddFormBuilder.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{unsafe:$objectType->getProcessor()->getLanguageVariable($action)}</h1>
+		<h1 class="contentTitle">{unsafe:$objectType->getProcessor()->getLanguageVariable($action)}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 
 	{hascontent}
diff --git a/wcfsetup/install/files/acp/templates/contactOptionAdd.tpl b/wcfsetup/install/files/acp/templates/contactOptionAdd.tpl
index a91fd0f37a3..e93404c8399 100644
--- a/wcfsetup/install/files/acp/templates/contactOptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/contactOptionAdd.tpl
@@ -4,7 +4,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}{$pageTitle}{/lang}</h1>
+		<h1 class="contentTitle">{lang}{$pageTitle}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl b/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
index f67e8f44c7b..4befdfca20f 100644
--- a/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.contact.recipient.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.contact.recipient.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index 21078aa4d44..c1625dd8d84 100644
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.cronjob.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.cronjob.{$action}{/lang}{if $action == 'edit'}: {$formObject->getDescription()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectAdd.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectAdd.tpl
index 9ac48b09d46..7def550400d 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.devtools.project.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.devtools.project.{$action}{/lang}{if $action == 'edit'}: {$formObject->name}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/labelAdd.tpl b/wcfsetup/install/files/acp/templates/labelAdd.tpl
index 55b93fb6f49..ceb4b8a5051 100644
--- a/wcfsetup/install/files/acp/templates/labelAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.label.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.label.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
index 687f8c64e2e..9b00249a467 100644
--- a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.label.group.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.label.group.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/languageAdd.tpl b/wcfsetup/install/files/acp/templates/languageAdd.tpl
index a8bb28e34a7..63c5c2f3c7f 100644
--- a/wcfsetup/install/files/acp/templates/languageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.language.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.language.{$action}{/lang}{if $action == 'edit'}: {$formObject->languageName}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/menuAdd.tpl b/wcfsetup/install/files/acp/templates/menuAdd.tpl
index fd8fade00c5..18a7d2ce0b1 100644
--- a/wcfsetup/install/files/acp/templates/menuAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.menu.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.menu.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
index 5c0bb6087bf..913ee720e46 100644
--- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.menu.item.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.menu.item.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 		<p class="contentHeaderDescription">{lang}wcf.acp.menu.item.action.description{/lang}</p>
 	</div>
 	
diff --git a/wcfsetup/install/files/acp/templates/noticeAdd.tpl b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
index 73a9303006e..7375325b5eb 100644
--- a/wcfsetup/install/files/acp/templates/noticeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.notice.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.notice.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
index ad94a982e87..9e47c4a2db7 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.updateServer.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.updateServer.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/pageAdd.tpl b/wcfsetup/install/files/acp/templates/pageAdd.tpl
index d6f350e4029..59918d3b2fc 100644
--- a/wcfsetup/install/files/acp/templates/pageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageAdd.tpl
@@ -42,7 +42,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{if $action == 'add'}{lang}wcf.acp.page.add{/lang}{else}{lang}wcf.acp.page.edit{/lang}{/if}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.page.{$action}{/lang}{if $action == 'edit'}: {$page->name}{/if}</h1>
 	</div>
 
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
index 84d3a5c2c1b..5f79595f66d 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.paidSubscription.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.paidSubscription.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
index f162d963c69..253f6f3e307 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
@@ -10,12 +10,8 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.paidSubscription.user.{$action}{/lang}</h1>
-		{if $action == 'add'}
-			<p class="contentHeaderDescription">{$subscription->getTitle()}</p>
-		{else}
-			<p class="contentHeaderDescription">{$subscriptionUser->getUser()->username}</p>
-		{/if}
+		<h1 class="contentTitle">{lang}wcf.acp.paidSubscription.user.{$action}{/lang}{if $action == 'edit'}: {$subscriptionUser->getUser()->username}{/if}</h1>
+		<p class="contentHeaderDescription">{$subscription->getTitle()}</p>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/reactionTypeAdd.tpl b/wcfsetup/install/files/acp/templates/reactionTypeAdd.tpl
index 7b9110bf253..b776eb566fe 100644
--- a/wcfsetup/install/files/acp/templates/reactionTypeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/reactionTypeAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.menu.link.reactionType.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.menu.link.reactionType.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/smileyAdd.tpl b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
index 6c57cddd05f..9b35ac4eef9 100644
--- a/wcfsetup/install/files/acp/templates/smileyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.smiley.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.smiley.{$action}{/lang}{if $action == 'edit'}: {$smiley->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/smileyCategoryAdd.tpl b/wcfsetup/install/files/acp/templates/smileyCategoryAdd.tpl
index f45777f7f10..088b9d74e8d 100644
--- a/wcfsetup/install/files/acp/templates/smileyCategoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyCategoryAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{unsafe:$objectType->getProcessor()->getLanguageVariable($action)}</h1>
+		<h1 class="contentTitle">{unsafe:$objectType->getProcessor()->getLanguageVariable($action)}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 
 	{hascontent}
diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 14238bb080a..8c1da2698cc 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -31,8 +31,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.style.{$action}{/lang}</h1>
-		{if $action == 'edit'}<p class="contentHeaderDescription">{$styleName}</p>{/if}
+		<h1 class="contentTitle">{lang}wcf.acp.style.{$action}{/lang}{if $action == 'edit'}: {$style->styleName}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/tagAdd.tpl b/wcfsetup/install/files/acp/templates/tagAdd.tpl
index 8af33f3cd21..2455cefe6f8 100644
--- a/wcfsetup/install/files/acp/templates/tagAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/tagAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.tag.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.tag.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/templateAdd.tpl b/wcfsetup/install/files/acp/templates/templateAdd.tpl
index 9f39e2a8253..e2eac44438d 100644
--- a/wcfsetup/install/files/acp/templates/templateAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.template.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.template.{$action}{/lang}{if $action == 'edit'}: {$formObject->templateName}{/if}</h1>
 		{if $action == 'edit'}<p class="contentHeaderDescription">{$formObject->getPath()}</p>{/if}
 	</div>
 	
diff --git a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
index 03f121bfd1b..ed13775e879 100644
--- a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
@@ -10,7 +10,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.template.group.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.template.group.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/trophyAdd.tpl b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
index 744c0b21e37..110d240d6da 100644
--- a/wcfsetup/install/files/acp/templates/trophyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.menu.link.trophy.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.menu.link.trophy.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index 714054d75ab..656418124df 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -18,7 +18,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.group.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.group.{$action}{/lang}{if $action == 'edit'}: {$group->getName()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
index 8d0b99f820a..f25bd3fd629 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.group.assignment.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.group.assignment.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
index 1c2ecf1ded1..32998fe7410 100644
--- a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.user.option.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.user.option.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
index a636ef0bda9..c1a8dbe4d8f 100644
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.category.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.category.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/userRankAdd.tpl b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
index b592f0330ee..a8fe335840f 100644
--- a/wcfsetup/install/files/acp/templates/userRankAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
@@ -2,7 +2,7 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.user.rank.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.user.rank.{$action}{/lang}{if $action == 'edit'}: {$formObject->getTitle()}{/if}</h1>
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl b/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl
index 6c4c08a5cfa..1cde1443dc3 100644
--- a/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userTrophyAdd.tpl
@@ -23,7 +23,8 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.acp.menu.link.userTrophy.{$action}{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.acp.menu.link.userTrophy.{$action}{/lang}{if $action == 'edit'}: {$userTrophy->getTrophy()->getTitle()}{/if}</h1>
+		{if $action == 'edit'}<p class="contentHeaderDescription">{$userTrophy->getUserProfile()->getUsername()}</p>{/if}
 	</div>
 	
 	<nav class="contentHeaderNavigation">
diff --git a/wcfsetup/install/files/lib/form/AbstractDatabaseObjectBuilderForm.class.php b/wcfsetup/install/files/lib/form/AbstractDatabaseObjectBuilderForm.class.php
index c01a31d47a1..83af28a5234 100644
--- a/wcfsetup/install/files/lib/form/AbstractDatabaseObjectBuilderForm.class.php
+++ b/wcfsetup/install/files/lib/form/AbstractDatabaseObjectBuilderForm.class.php
@@ -96,7 +96,8 @@ public function assignVariables()
         WCF::getTPL()->assign([
             'action' => $this->formAction === 'create' ? 'add' : 'edit',
             'form' => $this->form,
-            'formObject' => $this->formObject,
+            // show the updated object after it has been saved
+            'formObject' => $this->formAction === 'edit' ? ($this->object ?? $this->formObject) : $this->formObject,
         ]);
     }