diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 11eebbf42..c5cbc0a4a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -3,5 +3,6 @@
    development, WebGUI 7 is finally here.
  - Fixed a bug in the asset manager where you could be redirected to a wrong
    page after using the delete, copy, cut, duplicate buttons.
-
+ - fix: Can't set View Purchase History Template in commerce settings
+ - fix: Template toolbar missing for Transaction Error Template
 
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 3b7ca730c..031a66708 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -595,11 +595,18 @@ sub www_editCommerceSettings {
 		-value		=> $session->setting->get("commerceConfirmCheckoutTemplateId"),
 		-namespace	=> 'Commerce/ConfirmCheckout'
 		);
+	$tabform->getTab('general')->template(
+		-name		=> 'commercePurchaseHistoryTemplateId',
+		-label		=> $i18n->get('purchase history template'),
+		-hoverHelp	=> $i18n->get('purchase history template description'),
+		-value		=> $session->setting->get('commercePurchaseHistoryTemplateId'),
+		-namespace	=> 'Commerce/ViewPurchaseHistory'
+		);
 	$tabform->getTab('general')->template(
 		-name		=> 'commerceTransactionErrorTemplateId',
 		-label		=> $i18n->get('transaction error template'),
 		-hoverHelp	=> $i18n->get('transaction error template description'),
-		-value		=> $session->setting->get('commerceTransactionPendingTemplateId'),
+		-value		=> $session->setting->get('commerceTransactionErrorTemplateId'),
 		-namespace	=> 'Commerce/TransactionError'
 		);
 	$tabform->getTab('general')->template(
diff --git a/lib/WebGUI/i18n/English/Commerce.pm b/lib/WebGUI/i18n/English/Commerce.pm
index 4dd7412f0..1b63727e1 100755
--- a/lib/WebGUI/i18n/English/Commerce.pm
+++ b/lib/WebGUI/i18n/English/Commerce.pm
@@ -1,6 +1,16 @@
 package WebGUI::i18n::English::Commerce;
 
 our $I18N = {
+        'purchase history template' => {
+		message => q|View Purchase History Template|,
+		lastUpdated => 0,
+		context => q|the title for the workflow activity that processes recurring payments|
+	},
+        'purchase history template description' => {
+		message => q|Controls the layout of the View Purchase History screen.  This screen is displayed to the user after a successful checkout is made and shows them all of their past purchases.|,
+		lastUpdated => 0,
+		context => q|the title for the workflow activity that processes recurring payments|
+	},
 	'process recurring payments' => {
 		message => q|Process Recurring Payments|,
 		lastUpdated => 0,