diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 7408e88758..e927e9de18 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -2,6 +2,8 @@
 
 <a name="maincontent"></a>
 
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<fieldset>
diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index 1f0bbe14c8..7dc3f6ec97 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -5,7 +5,7 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_ENABLE_EXPLAIN}</p>
+	<p>{L_DISABLE_EXPLAIN}</p>
 
 	<!-- IF PRE -->
 	<div class="errorbox">
@@ -15,7 +15,8 @@
 	<form id="acp_extensions" method="post" action="{U_DISABLE}">
 	<fieldset class="submit-buttons">
 		<legend>{L_DISABLE}</legend>
-		<input class="button1" type="submit" name="{L_DISABLE}" value="{L_DISABLE}" />
+		<input class="button1" type="submit" name="disable" value="{L_DISABLE}" />
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 9f278bfbe0..3f7be2c847 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -15,7 +15,8 @@
 	<form id="acp_extensions" method="post" action="{U_ENABLE}">
 	<fieldset class="submit-buttons">
 		<legend>{L_ENABLE}</legend>
-		<input class="button1" type="submit" name="{L_ENABLE}" value="{L_ENABLE}" />
+		<input class="button1" type="submit" name="enable" value="{L_ENABLE}" />
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html
index 816fd872b9..00a58721cb 100644
--- a/phpBB/adm/style/acp_ext_purge.html
+++ b/phpBB/adm/style/acp_ext_purge.html
@@ -5,7 +5,7 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_ENABLE_EXPLAIN}</p>
+	<p>{L_PURGE_EXPLAIN}</p>
 
 	<!-- IF PRE -->
 	<div class="errorbox">
@@ -15,7 +15,8 @@
 	<form id="acp_extensions" method="post" action="{U_PURGE}">
 	<fieldset class="submit-buttons">
 		<legend>{L_PURGE}</legend>
-		<input class="button1" type="submit" name="{L_PURGE}" value="{L_PURGE}" />
+		<input class="button1" type="submit" name="purge" value="{L_PURGE}" />
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index c4d9f0c0e0..1a9d51505a 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -43,6 +43,13 @@ class acp_extensions
 
 		$action = $request->variable('action', 'list');
 		$ext_name = $request->variable('ext_name', '');
+			
+		// Cancel action
+		if ($request->is_set_post('cancel'))
+		{
+			$action = 'list';
+			$ext_name = '';
+		}
 
 		// If they've specificed an extension, let's load the metadata manager and validate it.
 		if ($ext_name)
@@ -162,6 +169,8 @@ class acp_extensions
 				// Output it to the template
 				$md_manager->output_template_data();
 
+				$template->assign_var('U_BACK', $this->u_action . '&amp;action=list');
+
 				$this->tpl_name = 'acp_ext_details';
 			break;
 		}