diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php
index 1b02baeab28..ddf88112c96 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php
@@ -44,15 +44,15 @@ protected function _prepareLayout()
 
         if ($alertPriceAllow) {
             $accordion->addItem('price', [
-                'title'     => Mage::helper('adminhtml')->__('Price alert subscription was saved.'),
-                'content'   => $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_alerts_price')->toHtml() . '<br />',
+                'title'     => Mage::helper('adminhtml')->__('Product price alert'),
+                'content'   => $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_alerts_price')->toHtml(),
                 'open'      => true
             ]);
         }
         if ($alertStockAllow) {
             $accordion->addItem('stock', [
-                'title'     => Mage::helper('adminhtml')->__('Stock notification was saved.'),
-                'content'   => $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_alerts_stock'),
+                'title'     => Mage::helper('adminhtml')->__('Product stock alert'),
+                'content'   => $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_alerts_stock')->toHtml(),
                 'open'      => true
             ]);
         }
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php
index c2d7b741563..394225546d5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php
@@ -30,7 +30,7 @@ public function __construct()
         $this->setDefaultDir('desc');
         $this->setUseAjax(true);
         $this->setFilterVisibility(false);
-        $this->setEmptyText(Mage::helper('catalog')->__('There are no customers for this alert'));
+        $this->setEmptyText(Mage::helper('catalog')->__('There are no customers for this alert.'));
     }
 
     protected function _prepareCollection()
diff --git a/app/code/core/Mage/ProductAlert/etc/system.xml b/app/code/core/Mage/ProductAlert/etc/system.xml
index f577f413a34..bb6fc573d0b 100644
--- a/app/code/core/Mage/ProductAlert/etc/system.xml
+++ b/app/code/core/Mage/ProductAlert/etc/system.xml
@@ -25,52 +25,67 @@
                     <show_in_website>1</show_in_website>
                     <show_in_store>1</show_in_store>
                     <fields>
-                        <allow_price translate="label">
-                            <label>Allow Alert When Product Price Changes</label>
+                        <email_identity translate="label">
+                            <label>Alert Email Sender</label>
                             <frontend_type>select</frontend_type>
-                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <source_model>adminhtml/system_config_source_email_identity</source_model>
                             <sort_order>1</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                        </allow_price>
-                        <allow_stock translate="label">
-                            <label>Allow Alert When Product Comes Back in Stock</label>
+                        </email_identity>
+                        <head_price translate="label">
+                            <label>Allow Alert When Product Price Changes</label>
+                            <frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
+                            <sort_order>10</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </head_price>
+                        <allow_price translate="label">
+                            <label>Enabled</label>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_yesno</source_model>
-                            <sort_order>3</sort_order>
+                            <sort_order>11</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
-                        </allow_stock>
-
+                            <show_in_store>1</show_in_store>
+                        </allow_price>
                         <email_price_template translate="label">
                             <label>Price Alert Email Template</label>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_email_template</source_model>
-                            <sort_order>2</sort_order>
+                            <sort_order>12</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </email_price_template>
-                        <email_stock_template translate="label">
-                            <label>Stock Alert Email Template</label>
+                        <head_stock translate="label">
+                            <label>Allow Alert When Product Comes Back in Stock</label>
+                            <frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
+                            <sort_order>20</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </head_stock>
+                        <allow_stock translate="label">
+                            <label>Enabled</label>
                             <frontend_type>select</frontend_type>
-                            <source_model>adminhtml/system_config_source_email_template</source_model>
-                            <sort_order>4</sort_order>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>21</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                        </email_stock_template>
-                        <email_identity translate="label">
-                            <label>Alert Email Sender</label>
+                        </allow_stock>
+                        <email_stock_template translate="label">
+                            <label>Stock Alert Email Template</label>
                             <frontend_type>select</frontend_type>
-                            <source_model>adminhtml/system_config_source_email_identity</source_model>
-                            <sort_order>5</sort_order>
+                            <source_model>adminhtml/system_config_source_email_template</source_model>
+                            <sort_order>22</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                        </email_identity>
+                        </email_stock_template>
                     </fields>
                 </productalert>
                 <productalert_cron translate="label" module="productalert">
diff --git a/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml b/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml
index 16e9ad623e1..cb39b7db7cb 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml
@@ -18,9 +18,6 @@
  * Template for block Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Alerts
  */
 ?>
+
 <div id="alert_messages_block"><?php echo $this->getMessageHtml() ?></div>
-<div>
-    <h4 class="icon-head head-edit-form"><?php echo Mage::helper('productalert')->__('Product Alerts') ?></h4>
-</div>
-<div class="clear"></div>
 <?php echo $this->getAccordionHtml() ?>
diff --git a/app/locale/en_US/Mage_Adminhtml.csv b/app/locale/en_US/Mage_Adminhtml.csv
index c85c5f04c78..a7054feb73d 100644
--- a/app/locale/en_US/Mage_Adminhtml.csv
+++ b/app/locale/en_US/Mage_Adminhtml.csv
@@ -806,7 +806,6 @@
 "Preview","Preview"
 "Preview Template","Preview Template"
 "Price","Price"
-"Price alert subscription was saved.","Price alert subscription was saved."
 "Price:","Price:"
 "Processed <strong>%s%% %s/%d</strong> records","Processed <strong>%s%% %s/%d</strong> records"
 "Processing","Processing"
@@ -984,7 +983,6 @@
 "Status","Status"
 "Status:","Status:"
 "Stock Quantity:","Stock Quantity:"
-"Stock notification was saved.","Stock notification was saved."
 "Store","Store"
 "Store View","Store View"
 "Store:","Store:"
diff --git a/app/locale/en_US/Mage_Catalog.csv b/app/locale/en_US/Mage_Catalog.csv
index 6f461c89f46..d23e9baef59 100644
--- a/app/locale/en_US/Mage_Catalog.csv
+++ b/app/locale/en_US/Mage_Catalog.csv
@@ -729,7 +729,6 @@
 "The search was deleted.","The search was deleted."
 "The text is too long","The text is too long"
 "There are no %s available.","There are no %s available."
-"There are no customers for this alert","There are no customers for this alert"
 "There are no customers for this alert.","There are no customers for this alert."
 "There are no products matching the selection.","There are no products matching the selection."
 "There was an error while request processing.","There was an error while request processing."
diff --git a/app/locale/en_US/Mage_ProductAlert.csv b/app/locale/en_US/Mage_ProductAlert.csv
index 440742d56f1..c1d950ae14d 100644
--- a/app/locale/en_US/Mage_ProductAlert.csv
+++ b/app/locale/en_US/Mage_ProductAlert.csv
@@ -1,5 +1,6 @@
 "Alert Email Sender","Alert Email Sender"
 "Alert subscription has been saved.","Alert subscription has been saved."
+"Enabled","Enabled"
 "Allow Alert When Product Comes Back in Stock","Allow Alert When Product Comes Back in Stock"
 "Allow Alert When Product Price Changes","Allow Alert When Product Price Changes"
 "Click here not to receive alerts for this product","Click here not to receive alerts for this product"