diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute.php
new file mode 100644
index 00000000000..4238eb3f2b4
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+class Mage_Adminhtml_Block_Customer_Address_Attribute extends Mage_Adminhtml_Block_Widget_Grid_Container
+{
+    public function __construct()
+    {
+        $this->_controller = 'customer_address_attribute';
+        $this->_headerText = Mage::helper('customer')->__('Manage Customer Address Attributes');
+        $this->_addButtonLabel = Mage::helper('customer')->__('Add New Attribute');
+        parent::__construct();
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit.php
new file mode 100644
index 00000000000..c0fb9589c91
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+class Mage_Adminhtml_Block_Customer_Address_Attribute_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
+{
+    public function __construct()
+    {
+        $this->_objectId = 'attribute_id';
+        $this->_controller = 'customer_address_attribute';
+
+        parent::__construct();
+
+        if($this->getRequest()->getParam('popup')) {
+            $this->_removeButton('back');
+            $this->_addButton(
+                'close',
+                array(
+                    'label'     => Mage::helper('catalog')->__('Close Window'),
+                    'class'     => 'cancel',
+                    'onclick'   => 'window.close()',
+                    'level'     => -1
+                )
+            );
+        } else {
+            $this->_addButton(
+                'save_and_edit_button',
+                array(
+                    'label'     => Mage::helper('catalog')->__('Save and Continue Edit'),
+                    'onclick'   => 'saveAndContinueEdit()',
+                    'class'     => 'save'
+                ),
+                100
+            );
+        }
+
+        $this->_updateButton('save', 'label', Mage::helper('catalog')->__('Save Attribute'));
+        $this->_updateButton('save', 'onclick', 'saveAttribute()');
+
+        if (! Mage::registry('entity_attribute')->getIsUserDefined()) {
+            $this->_removeButton('delete');
+        } else {
+            $this->_updateButton('delete', 'label', Mage::helper('catalog')->__('Delete Attribute'));
+        }
+    }
+
+    public function getHeaderText()
+    {
+        if (Mage::registry('entity_attribute')->getId()) {
+            $frontendLabel = Mage::registry('entity_attribute')->getFrontendLabel();
+            if (is_array($frontendLabel)) {
+                $frontendLabel = $frontendLabel[0];
+            }
+            return Mage::helper('catalog')->__('Edit Customer Attribute "%s"', $this->escapeHtml($frontendLabel));
+        }
+        else {
+            return Mage::helper('catalog')->__('New Customer Attribute');
+        }
+    }
+
+    public function getValidationUrl()
+    {
+        return $this->getUrl('*/*/validate', array('_current'=>true));
+    }
+
+    public function getSaveUrl()
+    {
+        return $this->getUrl('*/'.$this->_controller.'/save', array('_current'=>true, 'back'=>null));
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Form.php
new file mode 100644
index 00000000000..49ca2b9fb18
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Form.php
@@ -0,0 +1,12 @@
+<?php
+
+class Mage_Adminhtml_Block_Customer_Address_Attribute_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
+{
+    protected function _prepareForm()
+    {
+        $form = new Varien_Data_Form(['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']);
+        $form->setUseContainer(true);
+        $this->setForm($form);
+        return parent::_prepareForm();
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Tab/Main.php
new file mode 100644
index 00000000000..4f0a44abe09
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Tab/Main.php
@@ -0,0 +1,71 @@
+<?php
+
+class Mage_Adminhtml_Block_Customer_Address_Attribute_Edit_Tab_Main
+    extends Mage_Eav_Block_Adminhtml_Attribute_Edit_Main_Abstract
+    implements Mage_Adminhtml_Block_Widget_Tab_Interface
+{
+    protected function _prepareForm()
+    {
+        parent::_prepareForm();
+
+        $helper = Mage::helper('customer');
+        $attribute = $this->getAttributeObject();
+        $form = $this->getForm();
+
+        // frontend properties fieldset
+        $fieldset = $form->addFieldset('front_fieldset', [
+            'legend' => $helper->__('Frontend Properties')
+        ]);
+        $fieldset->addField('sort_order', 'text', [
+            'name' => 'sort_order',
+            'label' => $helper->__('Sort Order'),
+            'title' => $helper->__('Sort Order'),
+            'class' => 'validate-digits'
+        ]);
+
+        $fieldset->addField('used_in_forms', 'multiselect', array(
+            'name'         => 'used_in_forms',
+            'label'        => $helper->__('Forms to Use In'),
+            'title'        => $helper->__('Forms to Use In'),
+            'value'        => $attribute->getUsedInForms(),
+            'can_be_empty' => true,
+            'values'       => [
+                [
+                    'label' => Mage::helper('customer')->__('Customer Address Registration'),
+                    'value' => 'customer_register_address'
+                ],
+                [
+                    'label' => Mage::helper('customer')->__('Customer Account Address'),
+                    'value' => 'customer_address_edit'
+                ]
+            ]
+        ))->setSize(4);
+
+        Mage::dispatchEvent('adminhtml_customer_address_attribute_edit_prepare_form', array(
+            'form'      => $form,
+            'attribute' => $attribute
+        ));
+
+        return $this;
+    }
+
+    public function getTabLabel()
+    {
+        return Mage::helper('customer')->__('Properties');
+    }
+
+    public function getTabTitle()
+    {
+        return Mage::helper('customer')->__('Properties');
+    }
+
+    public function canShowTab()
+    {
+        return true;
+    }
+
+    public function isHidden()
+    {
+        return false;
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Tab/Options.php
new file mode 100644
index 00000000000..236c7614a4a
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Tab/Options.php
@@ -0,0 +1,27 @@
+<?php
+
+class Mage_Adminhtml_Block_Customer_Address_Attribute_Edit_Tab_Options
+    extends Mage_Eav_Block_Adminhtml_Attribute_Edit_Options_Abstract
+    implements Mage_Adminhtml_Block_Widget_Tab_Interface
+{
+
+    public function getTabLabel()
+    {
+        return Mage::helper('customer')->__('Manage Label / Options');
+    }
+
+    public function getTabTitle()
+    {
+        return Mage::helper('customer')->__('Properties');
+    }
+
+    public function canShowTab()
+    {
+        return true;
+    }
+
+    public function isHidden()
+    {
+        return false;
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Tabs.php
new file mode 100644
index 00000000000..d92d51273c0
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Edit/Tabs.php
@@ -0,0 +1,12 @@
+<?php
+
+class Mage_Adminhtml_Block_Customer_Address_Attribute_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setId('customer_address_attribute_tabs');
+        $this->setDestElementId('edit_form');
+        $this->setTitle(Mage::helper('customer')->__('Attribute Information'));
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Grid.php
new file mode 100644
index 00000000000..0a7d10bd756
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Address/Attribute/Grid.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+class Mage_Adminhtml_Block_Customer_Address_Attribute_Grid extends Mage_Eav_Block_Adminhtml_Attribute_Grid_Abstract
+{
+    protected function _prepareCollection()
+    {
+        $collection = Mage::getResourceModel('customer/address_attribute_collection')
+            ->addVisibleFilter();
+        $this->setCollection($collection);
+
+        return parent::_prepareCollection();
+    }
+
+    protected function _prepareColumns()
+    {
+        parent::_prepareColumns();
+
+        $this->addColumn('is_visible', [
+            'header'   => Mage::helper('customer')->__('Visible on Frontend'),
+            'sortable' => true,
+            'index'    => 'is_visible',
+            'align'    => 'center',
+            'type'     => 'options',
+            'options'  => [
+                '1' => Mage::helper('customer')->__('Yes'),
+                '0' => Mage::helper('customer')->__('No')
+            ]
+        ]);
+
+        $this->addColumn('sort_order', array(
+            'header'   => Mage::helper('customer')->__('Sort Order'),
+            'sortable' => true,
+            'index'    => 'sort_order',
+            'align'    => 'center'
+        ));
+
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute.php
new file mode 100644
index 00000000000..f9332165963
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+class Mage_Adminhtml_Block_Customer_Attribute extends Mage_Adminhtml_Block_Widget_Grid_Container
+{
+    public function __construct()
+    {
+        $this->_controller = 'customer_attribute';
+        $this->_headerText = Mage::helper('customer')->__('Manage Customer Attributes');
+        $this->_addButtonLabel = Mage::helper('customer')->__('Add New Attribute');
+        parent::__construct();
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit.php
new file mode 100644
index 00000000000..eaae3e7e760
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+class Mage_Adminhtml_Block_Customer_Attribute_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
+{
+    public function __construct()
+    {
+        $this->_objectId = 'attribute_id';
+        $this->_controller = 'customer_attribute';
+
+        parent::__construct();
+
+        if($this->getRequest()->getParam('popup')) {
+            $this->_removeButton('back');
+            $this->_addButton(
+                'close',
+                array(
+                    'label'     => Mage::helper('catalog')->__('Close Window'),
+                    'class'     => 'cancel',
+                    'onclick'   => 'window.close()',
+                    'level'     => -1
+                )
+            );
+        } else {
+            $this->_addButton(
+                'save_and_edit_button',
+                array(
+                    'label'     => Mage::helper('catalog')->__('Save and Continue Edit'),
+                    'onclick'   => 'saveAndContinueEdit()',
+                    'class'     => 'save'
+                ),
+                100
+            );
+        }
+
+        $this->_updateButton('save', 'label', Mage::helper('catalog')->__('Save Attribute'));
+        $this->_updateButton('save', 'onclick', 'saveAttribute()');
+
+        if (! Mage::registry('entity_attribute')->getIsUserDefined()) {
+            $this->_removeButton('delete');
+        } else {
+            $this->_updateButton('delete', 'label', Mage::helper('catalog')->__('Delete Attribute'));
+        }
+    }
+
+    public function getHeaderText()
+    {
+        if (Mage::registry('entity_attribute')->getId()) {
+            $frontendLabel = Mage::registry('entity_attribute')->getFrontendLabel();
+            if (is_array($frontendLabel)) {
+                $frontendLabel = $frontendLabel[0];
+            }
+            return Mage::helper('catalog')->__('Edit Customer Attribute "%s"', $this->escapeHtml($frontendLabel));
+        }
+        else {
+            return Mage::helper('catalog')->__('New Customer Attribute');
+        }
+    }
+
+    public function getValidationUrl()
+    {
+        return $this->getUrl('*/*/validate', array('_current'=>true));
+    }
+
+    public function getSaveUrl()
+    {
+        return $this->getUrl('*/'.$this->_controller.'/save', array('_current'=>true, 'back'=>null));
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Form.php
new file mode 100644
index 00000000000..1a45286e437
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Form.php
@@ -0,0 +1,12 @@
+<?php
+
+class Mage_Adminhtml_Block_Customer_Attribute_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
+{
+    protected function _prepareForm()
+    {
+        $form = new Varien_Data_Form(['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']);
+        $form->setUseContainer(true);
+        $this->setForm($form);
+        return parent::_prepareForm();
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Tab/Main.php
new file mode 100644
index 00000000000..8253d02b4f4
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Tab/Main.php
@@ -0,0 +1,73 @@
+<?php
+
+class Mage_Adminhtml_Block_Customer_Attribute_Edit_Tab_Main
+    extends Mage_Eav_Block_Adminhtml_Attribute_Edit_Main_Abstract
+    implements Mage_Adminhtml_Block_Widget_Tab_Interface
+{
+    protected function _prepareForm()
+    {
+        parent::_prepareForm();
+
+        $helper = Mage::helper('customer');
+        $attribute = $this->getAttributeObject();
+        $form = $this->getForm();
+
+        // frontend properties fieldset
+        $fieldset = $form->addFieldset('front_fieldset', [
+            'legend' => $helper->__('Frontend Properties')
+        ]);
+        $fieldset->addField('sort_order', 'text', [
+            'name' => 'sort_order',
+            'label' => $helper->__('Sort Order'),
+            'title' => $helper->__('Sort Order'),
+            'class' => 'validate-digits'
+        ]);
+
+        $fieldset->addField('used_in_forms', 'multiselect', array(
+            'name'         => 'used_in_forms',
+            'label'        => $helper->__('Forms to Use In'),
+            'title'        => $helper->__('Forms to Use In'),
+            'value'        => $attribute->getUsedInForms(),
+            'can_be_empty' => true,
+            'values'       => [
+                [
+                    'label' => $helper->__('Customer Checkout Register'),
+                    'value' => 'checkout_register'
+                ], [
+                    'label' => $helper->__('Customer Registration'),
+                    'value' => 'customer_account_create'
+                ], [
+                    'label' => $helper->__('Customer Account Edit'),
+                    'value' => 'customer_account_edit'
+                ]
+            ]
+        ))->setSize(4);
+
+        Mage::dispatchEvent('adminhtml_customer_attribute_edit_prepare_form', array(
+            'form'      => $form,
+            'attribute' => $attribute
+        ));
+
+        return $this;
+    }
+
+    public function getTabLabel()
+    {
+        return Mage::helper('customer')->__('Properties');
+    }
+
+    public function getTabTitle()
+    {
+        return Mage::helper('customer')->__('Properties');
+    }
+
+    public function canShowTab()
+    {
+        return true;
+    }
+
+    public function isHidden()
+    {
+        return false;
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Tab/Options.php
new file mode 100644
index 00000000000..ebe1c2fd260
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Tab/Options.php
@@ -0,0 +1,27 @@
+<?php
+
+class Mage_Adminhtml_Block_Customer_Attribute_Edit_Tab_Options
+    extends Mage_Eav_Block_Adminhtml_Attribute_Edit_Options_Abstract
+    implements Mage_Adminhtml_Block_Widget_Tab_Interface
+{
+
+    public function getTabLabel()
+    {
+        return Mage::helper('customer')->__('Manage Label / Options');
+    }
+
+    public function getTabTitle()
+    {
+        return Mage::helper('customer')->__('Properties');
+    }
+
+    public function canShowTab()
+    {
+        return true;
+    }
+
+    public function isHidden()
+    {
+        return false;
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Tabs.php
new file mode 100644
index 00000000000..f008e5d3a7f
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Edit/Tabs.php
@@ -0,0 +1,12 @@
+<?php
+
+class Mage_Adminhtml_Block_Customer_Attribute_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setId('customer_attribute_tabs');
+        $this->setDestElementId('edit_form');
+        $this->setTitle(Mage::helper('customer')->__('Attribute Information'));
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Grid.php
new file mode 100644
index 00000000000..665d6fde316
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Attribute/Grid.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+class Mage_Adminhtml_Block_Customer_Attribute_Grid extends Mage_Eav_Block_Adminhtml_Attribute_Grid_Abstract
+{
+    protected function _prepareCollection()
+    {
+        $collection = Mage::getResourceModel('customer/attribute_collection')
+            ->addVisibleFilter();
+        $this->setCollection($collection);
+
+        return parent::_prepareCollection();
+    }
+
+    protected function _prepareColumns()
+    {
+        parent::_prepareColumns();
+
+        $this->addColumn('is_visible', [
+            'header'   => Mage::helper('customer')->__('Visible on Frontend'),
+            'sortable' => true,
+            'index'    => 'is_visible',
+            'align'    => 'center',
+            'type'     => 'options',
+            'options'  => [
+                '1' => Mage::helper('customer')->__('Yes'),
+                '0' => Mage::helper('customer')->__('No')
+            ]
+        ]);
+
+        $this->addColumn('sort_order', array(
+            'header'   => Mage::helper('customer')->__('Sort Order'),
+            'sortable' => true,
+            'index'    => 'sort_order',
+            'align'    => 'center'
+        ));
+
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Address/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Address/AttributeController.php
new file mode 100644
index 00000000000..2326b82a005
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Address/AttributeController.php
@@ -0,0 +1,343 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+class Mage_Adminhtml_Customer_Address_AttributeController extends Mage_Adminhtml_Controller_Action
+{
+    protected $_entityTypeId;
+    
+    /**
+     * List of tags from setting
+     */
+    const XML_PATH_ALLOWED_TAGS = 'system/catalog/frontend/allowed_html_tags_list';
+
+    public function preDispatch()
+    {
+        $this->_setForcedFormKeyActions('delete');
+        parent::preDispatch();
+        $this->_entityTypeId = Mage::getModel('eav/entity')->setType(Mage_Customer_Model_Address::ENTITY)->getTypeId();
+        return $this;
+    }
+
+    protected function _initAction()
+    {
+        $this
+            ->_title($this->__('Customer'))
+            ->_title($this->__('Attributes'))
+            ->_title($this->__('Manage Customer Address Attributes'));
+
+        if($this->getRequest()->getParam('popup')) {
+            $this->loadLayout('popup');
+        } else {
+            $this->loadLayout()
+                ->_setActiveMenu('customer/attributes')
+                ->_addBreadcrumb(Mage::helper('customer')->__('Customer'), Mage::helper('customer')->__('Customer'))
+                ->_addBreadcrumb(
+                    Mage::helper('catalog')->__('Manage Customer Address Attributes'),
+                    Mage::helper('catalog')->__('Manage Customer Address Attributes'))
+            ;
+        }
+        return $this;
+    }
+
+    public function indexAction()
+    {
+        $this->_initAction()
+            ->_addContent($this->getLayout()->createBlock('adminhtml/customer_address_attribute'))
+            ->renderLayout();
+    }
+
+    public function newAction()
+    {
+        $this->addActionLayoutHandles();
+        $this->_forward('edit');
+    }
+
+    public function editAction()
+    {
+        $id = $this->getRequest()->getParam('attribute_id');
+        $model = Mage::getModel('customer/attribute')
+            ->setEntityTypeId($this->_entityTypeId);
+
+        if ($id) {
+            $model->load($id);
+            if (!$model->getId()) {
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('customer')->__('This attribute no longer exists'));
+                $this->_redirect('*/*/');
+                return;
+            }
+
+            // entity type check
+            if ($model->getEntityTypeId() != $this->_entityTypeId) {
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('customer')->__('This attribute cannot be edited.'));
+                $this->_redirect('*/*/');
+                return;
+            }
+        }
+
+        // set entered data if was error when we do save
+        $data = Mage::getSingleton('adminhtml/session')->getAttributeData(true);
+        if (!empty($data)) {
+            $model->addData($data);
+        }
+
+        Mage::register('entity_attribute', $model);
+        $this->_initAction();
+        $this->_title($id ? $model->getName() : $this->__('New Attribute'));
+        $item = $id ? Mage::helper('customer')->__('Edit Customer Attribute')
+            : Mage::helper('customer')->__('New Customer Attribute');
+        $this->_addBreadcrumb($item, $item);
+        $this->renderLayout();
+    }
+
+    public function validateAction()
+    {
+        $response = new Varien_Object();
+        $response->setError(false);
+
+        $attributeCode  = $this->getRequest()->getParam('attribute_code');
+        $attributeId    = $this->getRequest()->getParam('attribute_id');
+        $attribute = Mage::getModel('customer/attribute')
+            ->loadByCode($this->_entityTypeId, $attributeCode);
+
+        if ($attribute->getId() && !$attributeId) {
+            Mage::getSingleton('adminhtml/session')->addError(
+                Mage::helper('customer')->__('Attribute with the same code already exists'));
+            $this->_initLayoutMessages('adminhtml/session');
+            $response->setError(true);
+            $response->setMessage($this->getLayout()->getMessagesBlock()->getGroupedHtml());
+        }
+
+        $this->getResponse()->setBody($response->toJson());
+    }
+
+    /**
+     * Get list of allowed text formatted as array
+     *
+     * @return array
+     */
+    protected function _getAllowedTags()
+    {
+        return explode(',', Mage::getStoreConfig(self::XML_PATH_ALLOWED_TAGS));
+    }
+
+    /**
+     * Filter post data
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function _filterPostData($data)
+    {
+        if ($data) {
+            /** @var Mage_Customer_Helper_Data $helper */
+            $helper = Mage::helper('customer');
+            //labels
+            $data['frontend_label'] = (array) $data['frontend_label'];
+            foreach ($data['frontend_label'] as & $value) {
+                if ($value) {
+                    $value = $helper->stripTags($value);
+                }
+            }
+
+            if (!empty($data['option']) && !empty($data['option']['value']) && is_array($data['option']['value'])) {
+                $allowableTags = isset($data['is_html_allowed_on_front']) && $data['is_html_allowed_on_front']
+                    ? sprintf('<%s>', implode('><', $this->_getAllowedTags())) : null;
+                foreach ($data['option']['value'] as $key => $values) {
+                    foreach ($values as $storeId => $storeLabel) {
+                        $data['option']['value'][$key][$storeId]
+                            = $helper->stripTags($storeLabel, $allowableTags);
+                    }
+                }
+            }
+        }
+        return $data;
+    }
+
+    public function saveAction()
+    {
+        $data = $this->getRequest()->getPost();
+        if ($data) {
+            /** @var Mage_Admin_Model_Session $session */
+            $session = Mage::getSingleton('adminhtml/session');
+
+            $redirectBack = $this->getRequest()->getParam('back', false);
+            $model = Mage::getModel('customer/attribute')
+                ->setEntityTypeId($this->_entityTypeId);
+            $helper = Mage::helper('customer');
+
+            $id = $this->getRequest()->getParam('attribute_id');
+
+            //validate attribute_code
+            if (isset($data['attribute_code'])) {
+                $validatorAttrCode = new Zend_Validate_Regex(array('pattern' => '/^(?!event$)[a-z][a-z_0-9]{1,254}$/'));
+                if (!$validatorAttrCode->isValid($data['attribute_code'])) {
+                    $session->addError(
+                        Mage::helper('customer')->__('Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter. Do not use "event" for an attribute code.')
+                    );
+                    $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
+                    return;
+                }
+            }
+
+            //validate frontend_input
+            if (isset($data['frontend_input'])) {
+                /** @var Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype_Validator $validatorInputType */
+                $validatorInputType = Mage::getModel('eav/adminhtml_system_config_source_inputtype_validator');
+                if (!$validatorInputType->isValid($data['frontend_input'])) {
+                    foreach ($validatorInputType->getMessages() as $message) {
+                        $session->addError($message);
+                    }
+                    $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
+                    return;
+                }
+            }
+
+            if ($id) {
+                $model->load($id);
+
+                if (!$model->getId()) {
+                    $session->addError($helper->__('This Attribute no longer exists'));
+                    $this->_redirect('*/*/');
+                    return;
+                }
+
+                // entity type check
+                if ($model->getEntityTypeId() != $this->_entityTypeId) {
+                    $session->addError($helper->__('This attribute cannot be updated.'));
+                    $session->setAttributeData($data);
+                    $this->_redirect('*/*/');
+                    return;
+                }
+
+                $data['backend_model'] = $model->getBackendModel();
+                $data['attribute_code'] = $model->getAttributeCode();
+                $data['is_user_defined'] = $model->getIsUserDefined();
+                $data['frontend_input'] = $model->getFrontendInput();
+            } else {
+                $data['source_model'] = $helper->getAttributeSourceModelByInputType($data['frontend_input']);
+                $data['backend_model'] = $helper->getAttributeBackendModelByInputType($data['frontend_input']);
+            }
+
+            if (!isset($data['is_configurable'])) {
+                $data['is_configurable'] = 0;
+            }
+
+            if (is_null($model->getIsUserDefined()) || $model->getIsUserDefined() != 0) {
+                $data['backend_type'] = $model->getBackendTypeByInput($data['frontend_input']);
+            }
+
+            $defaultValueField = $model->getDefaultValueByInput($data['frontend_input']);
+            if ($defaultValueField) {
+                $data['default_value'] = $this->getRequest()->getParam($defaultValueField);
+            }
+
+            if(!isset($data['apply_to'])) {
+                $data['apply_to'] = array();
+            }
+
+            if ($model) {
+                $data['entity_type_id'] = $model->getEntityTypeId();
+            }
+
+            //filter
+            $data = $this->_filterPostData($data);
+            $model->addData($data);
+
+            if (!$id) {
+                $model->setEntityTypeId($this->_entityTypeId);
+                $model->setIsUserDefined(1);
+            }
+
+            try {
+                $model->save();
+                $session->addSuccess($helper->__('The product attribute has been saved.'));
+
+                /**
+                 * Clear translation cache because attribute labels are stored in translation
+                 */
+                Mage::app()->cleanCache(array(Mage_Core_Model_Translate::CACHE_TAG));
+                $session->setAttributeData(false);
+                if ($this->getRequest()->getParam('popup')) {
+                    $this->_redirect('adminhtml/customer/addAttribute', array(
+                        'id'       => $this->getRequest()->getParam('customer'),
+                        'attribute'=> $model->getId(),
+                        '_current' => true
+                    ));
+                } elseif ($redirectBack) {
+                    $this->_redirect('*/*/edit', array('attribute_id' => $model->getId(),'_current'=>true));
+                } else {
+                    $this->_redirect('*/*/', array());
+                }
+                return;
+            } catch (Exception $e) {
+                $session->addError($e->getMessage());
+                $session->setAttributeData($data);
+                $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
+                return;
+            }
+        }
+        $this->_redirect('*/*/');
+    }
+
+    public function deleteAction()
+    {
+        if ($id = $this->getRequest()->getParam('attribute_id')) {
+            $model = Mage::getModel('customer/attribute')
+                ->setEntityTypeId($this->_entityTypeId);
+
+            // entity type check
+            $model->load($id);
+            if ($model->getEntityTypeId() != $this->_entityTypeId || !$model->getIsUserDefined()) {
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('customer')->__('This attribute cannot be deleted.'));
+                $this->_redirect('*/*/');
+                return;
+            }
+
+            try {
+                $model->delete();
+                Mage::getSingleton('adminhtml/session')->addSuccess(
+                    Mage::helper('customer')->__('The product attribute has been deleted.'));
+                $this->_redirect('*/*/');
+                return;
+            } catch (Exception $e) {
+                Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+                $this->_redirect('*/*/edit', array('attribute_id' => $this->getRequest()->getParam('attribute_id')));
+                return;
+            }
+        }
+        Mage::getSingleton('adminhtml/session')->addError(
+            Mage::helper('customer')->__('Unable to find an attribute to delete.'));
+        $this->_redirect('*/*/');
+    }
+
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('customer/attributes/customer_address_attributes');
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/AttributeController.php
new file mode 100644
index 00000000000..8c97b01f778
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/controllers/Customer/AttributeController.php
@@ -0,0 +1,343 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+class Mage_Adminhtml_Customer_AttributeController extends Mage_Adminhtml_Controller_Action
+{
+    protected $_entityTypeId;
+
+    /**
+     * List of tags from setting
+     */
+    const XML_PATH_ALLOWED_TAGS = 'system/catalog/frontend/allowed_html_tags_list';
+
+    public function preDispatch()
+    {
+        $this->_setForcedFormKeyActions('delete');
+        parent::preDispatch();
+        $this->_entityTypeId = Mage::getModel('eav/entity')->setType(Mage_Customer_Model_Customer::ENTITY)->getTypeId();
+        return $this;
+    }
+
+    protected function _initAction()
+    {
+        $this
+            ->_title($this->__('Customer'))
+            ->_title($this->__('Attributes'))
+            ->_title($this->__('Manage Customer Attributes'));
+
+        if($this->getRequest()->getParam('popup')) {
+            $this->loadLayout('popup');
+        } else {
+            $this->loadLayout()
+                ->_setActiveMenu('customer/attributes')
+                ->_addBreadcrumb(Mage::helper('customer')->__('Customer'), Mage::helper('customer')->__('Customer'))
+                ->_addBreadcrumb(
+                    Mage::helper('customer')->__('Manage Customer Attributes'),
+                    Mage::helper('customer')->__('Manage Customer Attributes'))
+            ;
+        }
+        return $this;
+    }
+
+    public function indexAction()
+    {
+        $this->_initAction()
+            ->_addContent($this->getLayout()->createBlock('adminhtml/customer_attribute'))
+            ->renderLayout();
+    }
+
+    public function newAction()
+    {
+        $this->addActionLayoutHandles();
+        $this->_forward('edit');
+    }
+
+    public function editAction()
+    {
+        $id = $this->getRequest()->getParam('attribute_id');
+        $model = Mage::getModel('customer/attribute')
+            ->setEntityTypeId($this->_entityTypeId);
+
+        if ($id) {
+            $model->load($id);
+            if (!$model->getId()) {
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('customer')->__('This attribute no longer exists'));
+                $this->_redirect('*/*/');
+                return;
+            }
+
+            // entity type check
+            if ($model->getEntityTypeId() != $this->_entityTypeId) {
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('customer')->__('This attribute cannot be edited.'));
+                $this->_redirect('*/*/');
+                return;
+            }
+        }
+
+        // set entered data if was error when we do save
+        $data = Mage::getSingleton('adminhtml/session')->getAttributeData(true);
+        if (!empty($data)) {
+            $model->addData($data);
+        }
+
+        Mage::register('entity_attribute', $model);
+        $this->_initAction();
+        $this->_title($id ? $model->getName() : $this->__('New Attribute'));
+        $item = $id ? Mage::helper('customer')->__('Edit Customer Attribute')
+            : Mage::helper('customer')->__('New Customer Attribute');
+        $this->_addBreadcrumb($item, $item);
+        $this->renderLayout();
+    }
+
+    public function validateAction()
+    {
+        $response = new Varien_Object();
+        $response->setError(false);
+
+        $attributeCode  = $this->getRequest()->getParam('attribute_code');
+        $attributeId    = $this->getRequest()->getParam('attribute_id');
+        $attribute = Mage::getModel('customer/attribute')
+            ->loadByCode($this->_entityTypeId, $attributeCode);
+
+        if ($attribute->getId() && !$attributeId) {
+            Mage::getSingleton('adminhtml/session')->addError(
+                Mage::helper('customer')->__('Attribute with the same code already exists'));
+            $this->_initLayoutMessages('adminhtml/session');
+            $response->setError(true);
+            $response->setMessage($this->getLayout()->getMessagesBlock()->getGroupedHtml());
+        }
+
+        $this->getResponse()->setBody($response->toJson());
+    }
+
+    /**
+     * Get list of allowed text formatted as array
+     *
+     * @return array
+     */
+    protected function _getAllowedTags()
+    {
+        return explode(',', Mage::getStoreConfig(self::XML_PATH_ALLOWED_TAGS));
+    }
+
+    /**
+     * Filter post data
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function _filterPostData($data)
+    {
+        if ($data) {
+            /** @var Mage_Customer_Helper_Data $helper */
+            $helper = Mage::helper('customer');
+            //labels
+            $data['frontend_label'] = (array) $data['frontend_label'];
+            foreach ($data['frontend_label'] as & $value) {
+                if ($value) {
+                    $value = $helper->stripTags($value);
+                }
+            }
+
+            if (!empty($data['option']) && !empty($data['option']['value']) && is_array($data['option']['value'])) {
+                $allowableTags = isset($data['is_html_allowed_on_front']) && $data['is_html_allowed_on_front']
+                    ? sprintf('<%s>', implode('><', $this->_getAllowedTags())) : null;
+                foreach ($data['option']['value'] as $key => $values) {
+                    foreach ($values as $storeId => $storeLabel) {
+                        $data['option']['value'][$key][$storeId]
+                            = $helper->stripTags($storeLabel, $allowableTags);
+                    }
+                }
+            }
+        }
+        return $data;
+    }
+
+    public function saveAction()
+    {
+        $data = $this->getRequest()->getPost();
+        if ($data) {
+            /** @var Mage_Admin_Model_Session $session */
+            $session = Mage::getSingleton('adminhtml/session');
+
+            $redirectBack = $this->getRequest()->getParam('back', false);
+            $model = Mage::getModel('customer/attribute')
+                ->setEntityTypeId($this->_entityTypeId);
+            $helper = Mage::helper('customer');
+
+            $id = $this->getRequest()->getParam('attribute_id');
+
+            //validate attribute_code
+            if (isset($data['attribute_code'])) {
+                $validatorAttrCode = new Zend_Validate_Regex(array('pattern' => '/^(?!event$)[a-z][a-z_0-9]{1,254}$/'));
+                if (!$validatorAttrCode->isValid($data['attribute_code'])) {
+                    $session->addError(
+                        Mage::helper('customer')->__('Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter. Do not use "event" for an attribute code.')
+                    );
+                    $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
+                    return;
+                }
+            }
+
+            //validate frontend_input
+            if (isset($data['frontend_input'])) {
+                /** @var Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype_Validator $validatorInputType */
+                $validatorInputType = Mage::getModel('eav/adminhtml_system_config_source_inputtype_validator');
+                if (!$validatorInputType->isValid($data['frontend_input'])) {
+                    foreach ($validatorInputType->getMessages() as $message) {
+                        $session->addError($message);
+                    }
+                    $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
+                    return;
+                }
+            }
+
+            if ($id) {
+                $model->load($id);
+
+                if (!$model->getId()) {
+                    $session->addError($helper->__('This Attribute no longer exists'));
+                    $this->_redirect('*/*/');
+                    return;
+                }
+
+                // entity type check
+                if ($model->getEntityTypeId() != $this->_entityTypeId) {
+                    $session->addError($helper->__('This attribute cannot be updated.'));
+                    $session->setAttributeData($data);
+                    $this->_redirect('*/*/');
+                    return;
+                }
+
+                $data['backend_model'] = $model->getBackendModel();
+                $data['attribute_code'] = $model->getAttributeCode();
+                $data['is_user_defined'] = $model->getIsUserDefined();
+                $data['frontend_input'] = $model->getFrontendInput();
+            } else {
+                $data['source_model'] = $helper->getAttributeSourceModelByInputType($data['frontend_input']);
+                $data['backend_model'] = $helper->getAttributeBackendModelByInputType($data['frontend_input']);
+            }
+
+            if (!isset($data['is_configurable'])) {
+                $data['is_configurable'] = 0;
+            }
+
+            if (is_null($model->getIsUserDefined()) || $model->getIsUserDefined() != 0) {
+                $data['backend_type'] = $model->getBackendTypeByInput($data['frontend_input']);
+            }
+
+            $defaultValueField = $model->getDefaultValueByInput($data['frontend_input']);
+            if ($defaultValueField) {
+                $data['default_value'] = $this->getRequest()->getParam($defaultValueField);
+            }
+
+            if(!isset($data['apply_to'])) {
+                $data['apply_to'] = array();
+            }
+
+            if ($model) {
+                $data['entity_type_id'] = $model->getEntityTypeId();
+            }
+
+            //filter
+            $data = $this->_filterPostData($data);
+            $model->addData($data);
+
+            if (!$id) {
+                $model->setEntityTypeId($this->_entityTypeId);
+                $model->setIsUserDefined(1);
+            }
+
+            try {
+                $model->save();
+                $session->addSuccess($helper->__('The product attribute has been saved.'));
+
+                /**
+                 * Clear translation cache because attribute labels are stored in translation
+                 */
+                Mage::app()->cleanCache(array(Mage_Core_Model_Translate::CACHE_TAG));
+                $session->setAttributeData(false);
+                if ($this->getRequest()->getParam('popup')) {
+                    $this->_redirect('adminhtml/customer/addAttribute', array(
+                        'id'       => $this->getRequest()->getParam('customer'),
+                        'attribute'=> $model->getId(),
+                        '_current' => true
+                    ));
+                } elseif ($redirectBack) {
+                    $this->_redirect('*/*/edit', array('attribute_id' => $model->getId(),'_current'=>true));
+                } else {
+                    $this->_redirect('*/*/', array());
+                }
+                return;
+            } catch (Exception $e) {
+                $session->addError($e->getMessage());
+                $session->setAttributeData($data);
+                $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
+                return;
+            }
+        }
+        $this->_redirect('*/*/');
+    }
+
+    public function deleteAction()
+    {
+        if ($id = $this->getRequest()->getParam('attribute_id')) {
+            $model = Mage::getModel('customer/attribute')
+                ->setEntityTypeId($this->_entityTypeId);
+
+            // entity type check
+            $model->load($id);
+            if ($model->getEntityTypeId() != $this->_entityTypeId || !$model->getIsUserDefined()) {
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('customer')->__('This attribute cannot be deleted.'));
+                $this->_redirect('*/*/');
+                return;
+            }
+
+            try {
+                $model->delete();
+                Mage::getSingleton('adminhtml/session')->addSuccess(
+                    Mage::helper('customer')->__('The customer attribute has been deleted.'));
+                $this->_redirect('*/*/');
+                return;
+            } catch (Exception $e) {
+                Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+                $this->_redirect('*/*/edit', array('attribute_id' => $this->getRequest()->getParam('attribute_id')));
+                return;
+            }
+        }
+        Mage::getSingleton('adminhtml/session')->addError(
+            Mage::helper('customer')->__('Unable to find an attribute to delete.'));
+        $this->_redirect('*/*/');
+    }
+
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('customer/attributes/customer_attributes');
+    }
+}
diff --git a/app/code/core/Mage/Customer/Helper/Data.php b/app/code/core/Mage/Customer/Helper/Data.php
index 9ec531ee12d..807924c0916 100644
--- a/app/code/core/Mage/Customer/Helper/Data.php
+++ b/app/code/core/Mage/Customer/Helper/Data.php
@@ -763,4 +763,64 @@ protected function _createVatNumberValidationSoapClient($trace = false)
     {
         return new SoapClient(self::VAT_VALIDATION_WSDL_URL, array('trace' => $trace));
     }
+
+    /**
+     * Return information array of product attribute input types
+     * Only a small number of settings returned, so we won't break anything in current dataflow
+     * As soon as development process goes on we need to add there all possible settings
+     *
+     * @param string $inputType
+     * @return array
+     */
+    public function getAttributeInputTypes($inputType = null)
+    {
+        /**
+         * @todo specify there all relations for properties depending on input type
+         */
+        $inputTypes = array(
+            'multiselect'   => array(
+                'backend_model'     => 'eav/entity_attribute_backend_array'
+            ),
+            'boolean'       => array(
+                'source_model'      => 'eav/entity_attribute_source_boolean'
+            )
+        );
+
+        if (is_null($inputType)) {
+            return $inputTypes;
+        } elseif (isset($inputTypes[$inputType])) {
+            return $inputTypes[$inputType];
+        }
+        return array();
+    }
+
+    /**
+     * Return default attribute source model by input type
+     *
+     * @param string $inputType
+     * @return string|null
+     */
+    public function getAttributeSourceModelByInputType($inputType)
+    {
+        $inputTypes = $this->getAttributeInputTypes();
+        if (!empty($inputTypes[$inputType]['source_model'])) {
+            return $inputTypes[$inputType]['source_model'];
+        }
+        return null;
+    }
+
+    /**
+     * Return default attribute backend model by input type
+     *
+     * @param string $inputType
+     * @return string|null
+     */
+    public function getAttributeBackendModelByInputType($inputType)
+    {
+        $inputTypes = $this->getAttributeInputTypes();
+        if (!empty($inputTypes[$inputType]['backend_model'])) {
+            return $inputTypes[$inputType]['backend_model'];
+        }
+        return null;
+    }
 }
diff --git a/app/code/core/Mage/Customer/Model/Address.php b/app/code/core/Mage/Customer/Model/Address.php
index 27bd1931f59..38d47689281 100644
--- a/app/code/core/Mage/Customer/Model/Address.php
+++ b/app/code/core/Mage/Customer/Model/Address.php
@@ -41,6 +41,8 @@
  */
 class Mage_Customer_Model_Address extends Mage_Customer_Model_Address_Abstract
 {
+    const ENTITY = 'customer_address';
+
     protected $_customer;
 
     protected function _construct()
diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php
index a1496391f5f..365f80d6ee1 100644
--- a/app/code/core/Mage/Customer/Model/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Customer.php
@@ -121,6 +121,8 @@
  */
 class Mage_Customer_Model_Customer extends Mage_Core_Model_Abstract
 {
+    const ENTITY = 'customer';
+
     /**#@+
      * Configuration pathes for email templates and identities
      */
@@ -155,7 +157,7 @@ class Mage_Customer_Model_Customer extends Mage_Core_Model_Abstract
     const SUBSCRIBED_NO  = 'no';
     /**#@-*/
 
-    const CACHE_TAG = 'customer';
+    const CACHE_TAG = self::ENTITY;
 
     /**
      * Minimum Password Length
@@ -178,14 +180,14 @@ class Mage_Customer_Model_Customer extends Mage_Core_Model_Abstract
      *
      * @var string
      */
-    protected $_eventPrefix = 'customer';
+    protected $_eventPrefix = self::ENTITY;
 
     /**
      * Name of the event object
      *
      * @var string
      */
-    protected $_eventObject = 'customer';
+    protected $_eventObject = self::ENTITY;
 
     /**
      * List of errors
diff --git a/app/code/core/Mage/Customer/etc/adminhtml.xml b/app/code/core/Mage/Customer/etc/adminhtml.xml
index 40363e19d8d..d80857339d9 100644
--- a/app/code/core/Mage/Customer/etc/adminhtml.xml
+++ b/app/code/core/Mage/Customer/etc/adminhtml.xml
@@ -30,7 +30,6 @@
         <customer translate="title" module="customer">
             <title>Customers</title>
             <sort_order>40</sort_order>
-            <!-- action>adminhtml/customer/</action -->
             <children>
                 <manage translate="title" module="customer">
                     <title>Manage Customers</title>
@@ -47,6 +46,20 @@
                     <action>adminhtml/customer_online/</action>
                     <sort_order>100</sort_order>
                 </online>
+                <attributes translate="title">
+                    <title>Attributes</title>
+                    <sort_order>200</sort_order>
+                    <children>
+                        <customer_attributes translate="title">
+                            <title>Manage Customer Attributes</title>
+                            <action>adminhtml/customer_attribute</action>
+                        </customer_attributes>
+                        <customer_address_attributes translate="title">
+                            <title>Manage Customer Address Attributes</title>
+                            <action>adminhtml/customer_address_attribute</action>
+                        </customer_address_attributes>
+                    </children>
+                </attributes>
             </children>
          </customer>
     </menu>
@@ -70,6 +83,20 @@
                                 <title>Online Customers</title>
                                 <sort_order>100</sort_order>
                             </online>
+                            <attributes>
+                                <title>Attributes</title>
+                                <sort_order>110</sort_order>
+                                <children>
+                                    <customer_attributes>
+                                        <title>Customer Attributes</title>
+                                        <sort_order>10</sort_order>
+                                    </customer_attributes>
+                                    <customer_address_attributes>
+                                        <title>Customer Address Attributes</title>
+                                        <sort_order>20</sort_order>
+                                    </customer_address_attributes>
+                                </children>
+                            </attributes>
                         </children>
                     </customer>
                     <system>
diff --git a/app/design/adminhtml/default/default/layout/customer.xml b/app/design/adminhtml/default/default/layout/customer.xml
index acf2fe9340c..0067f93dbdf 100644
--- a/app/design/adminhtml/default/default/layout/customer.xml
+++ b/app/design/adminhtml/default/default/layout/customer.xml
@@ -32,15 +32,15 @@
             <block type="adminhtml/customer_edit" name="customer_edit"></block>
         </reference>
         <reference name="head">
-            <block type="adminhtml/template" name="optional_zip_countries" as="optional_zip_countries" template="directory/js/optional_zip_countries.phtml" />
+            <block type="adminhtml/template" name="optional_zip_countries" as="optional_zip_countries" template="directory/js/optional_zip_countries.phtml"/>
             <action method="addJs"><file>mage/adminhtml/product/composite/configure.js</file></action>
             <action method="addJs"><file>varien/configurable.js</file></action>
         </reference>
         <reference name="left">
             <block type="adminhtml/customer_edit_tabs" name="customer_edit_tabs">
                 <block type="adminhtml/customer_edit_tab_view" name="customer_edit_tab_view" template="customer/tab/view.phtml">
-                    <block type="adminhtml/customer_edit_tab_view_sales" name="sales" template="customer/tab/view/sales.phtml" before="-" />
-                    <block type="adminhtml/customer_edit_tab_view_accordion" name="accordion" />
+                    <block type="adminhtml/customer_edit_tab_view_sales" name="sales" template="customer/tab/view/sales.phtml" before="-"/>
+                    <block type="adminhtml/customer_edit_tab_view_accordion" name="accordion"/>
                 </block>
                 <action method="addTab"><name>customer_edit_tab_view</name><block>customer_edit_tab_view</block></action>
             </block>
@@ -55,7 +55,7 @@
         </reference>
     </adminhtml_customer_group_index>
     <adminhtml_customer_wishlist>
-        <block type="adminhtml/customer_edit_tab_wishlist" name="customer.wishlist.edit.tab" output="toHtml" />
+        <block type="adminhtml/customer_edit_tab_wishlist" name="customer.wishlist.edit.tab" output="toHtml"/>
     </adminhtml_customer_wishlist>
 
     <adminhtml_customer_orders>
@@ -120,7 +120,55 @@
 
     <adminhtml_customer_cart>
         <block type="core/text_list" name="root" output="toHtml">
-            <block type="adminhtml/customer_edit_tab_cart" name="admin.customer.view.edit.cart" />
+            <block type="adminhtml/customer_edit_tab_cart" name="admin.customer.view.edit.cart"/>
         </block>
     </adminhtml_customer_cart>
+
+    <adminhtml_customer_attribute_edit>
+        <reference name="left">
+            <block type="adminhtml/store_switcher" name="store_switcher" template="store/switcher.phtml"/>
+            <block type="adminhtml/customer_attribute_edit_tabs" name="attribute_edit_tabs">
+                <block type="adminhtml/customer_attribute_edit_tab_main" name="customer_attribute_edit_tab_general"/>
+                <action method="addTab">
+                    <name>general</name>
+                    <block>customer_attribute_edit_tab_general</block>
+                </action>
+                <block type="adminhtml/customer_attribute_edit_tab_options" name="customer_attribute_edit_tab_options"/>
+                <action method="addTab">
+                    <name>options</name>
+                    <block>customer_attribute_edit_tab_options</block>
+                </action>
+            </block>
+        </reference>
+        <reference name="content">
+            <block type="adminhtml/customer_attribute_edit" name="attribute_edit_content"></block>
+        </reference>
+        <reference name="js">
+            <block type="adminhtml/template" name="attribute_edit_js" template="customer/attribute/js.phtml"></block>
+        </reference>
+    </adminhtml_customer_attribute_edit>
+
+    <adminhtml_customer_address_attribute_edit>
+        <reference name="left">
+            <block type="adminhtml/store_switcher" name="store_switcher" template="store/switcher.phtml"/>
+            <block type="adminhtml/customer_address_attribute_edit_tabs" name="attribute_edit_tabs">
+                <block type="adminhtml/customer_address_attribute_edit_tab_main" name="customer_address_attribute_edit_tab_general"/>
+                <action method="addTab">
+                    <name>general</name>
+                    <block>customer_address_attribute_edit_tab_general</block>
+                </action>
+                <block type="adminhtml/customer_address_attribute_edit_tab_options" name="customer_address_attribute_edit_tab_options"/>
+                <action method="addTab">
+                    <name>options</name>
+                    <block>customer_address_attribute_edit_tab_options</block>
+                </action>
+            </block>
+        </reference>
+        <reference name="content">
+            <block type="adminhtml/customer_address_attribute_edit" name="attribute_edit_content"></block>
+        </reference>
+        <reference name="js">
+            <block type="adminhtml/template" name="attribute_edit_js" template="customer/address/attribute/js.phtml"></block>
+        </reference>
+    </adminhtml_customer_address_attribute_edit>
 </layout>
diff --git a/app/design/adminhtml/default/default/template/customer/address/attribute/js.phtml b/app/design/adminhtml/default/default/template/customer/address/attribute/js.phtml
new file mode 100644
index 00000000000..b7fc9396166
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/customer/address/attribute/js.phtml
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<script type="text/javascript">
+    //<![CDATA[
+    function saveAndContinueEdit(){
+        disableElements('save');
+        var activeTab = customer_address_attribute_tabsJsTabs.activeTab.id;
+        if (editForm.submit($('edit_form').action+'back/edit/tab/' + activeTab) == false) {
+            enableElements('save');
+        }
+        varienGlobalEvents.attachEventHandler('formValidateAjaxComplete', function (){
+            enableElements('save');
+        });
+    }
+
+    function saveAttribute(){
+        disableElements('save');
+        if (editForm.submit() == false){
+            enableElements('save');
+        }
+        varienGlobalEvents.attachEventHandler('formValidateAjaxComplete', function (){
+            enableElements('save');
+        });
+    }
+
+    function toggleApplyVisibility(select) {
+        if ($(select).value == 1) {
+            $(select).next('select').removeClassName('no-display');
+            $(select).next('select').removeClassName('ignore-validate');
+
+        } else {
+            $(select).next('select').addClassName('no-display');
+            $(select).next('select').addClassName('ignore-validate');
+            var options = $(select).next('select').options;
+            for( var i=0; i < options.length; i++) {
+                options[i].selected = false;
+            }
+        }
+    }
+
+    function checkOptionsPanelVisibility(){
+        if($('matage-options-panel')){
+            var panel = $('matage-options-panel');
+            if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect')){
+                panel.show();
+            }
+            else {
+                panel.hide();
+            }
+        }
+    }
+
+    function bindAttributeInputType()
+    {
+        checkOptionsPanelVisibility();
+        switchDefaultValueField();
+        checkIsConfigurableVisibility();
+        if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect' || $('frontend_input').value=='price')){
+            if($('backend_type') && $('backend_type').options){
+                for(var i=0;i<$('backend_type').options.length;i++){
+                    if($('backend_type').options[i].value=='int') $('backend_type').selectedIndex = i;
+                }
+            }
+        }
+
+        switch ($('frontend_input').value) {
+            case 'textarea':
+                $('frontend_class').value = '';
+                $('frontend_class').disabled = true;
+                break;
+            case 'text':
+                if (!$('frontend_class').getAttribute('readonly')) {
+                    $('frontend_class').disabled = false;
+                }
+                break;
+            default:
+                $('frontend_class').value = '';
+                $('frontend_class').disabled = true;
+        }
+    }
+
+    function disableApplyToValue(value)
+    {
+        var applyToSelect = $('apply_to');
+        for (i=0;i<applyToSelect.options.length;i++) {
+            if (value == applyToSelect.options[i].value) {
+                applyToSelect.options[i].disabled = true;
+                applyToSelect.options[i].selected = false;
+            }
+        }
+    }
+
+    function switchDefaultValueField()
+    {
+        if (!$('frontend_input')) {
+            return;
+        }
+
+        var currentValue = $('frontend_input').value;
+
+        var defaultValueTextVisibility = false;
+        var defaultValueTextareaVisibility = false;
+        var defaultValueDateVisibility = false;
+        var defaultValueYesnoVisibility = false;
+        var scopeVisibility = true;
+
+        switch (currentValue) {
+            case 'select':
+                optionDefaultInputType = 'radio';
+                break;
+
+            case 'multiselect':
+                optionDefaultInputType = 'checkbox';
+                break;
+
+            case 'date':
+                defaultValueDateVisibility = true;
+                break;
+
+            case 'boolean':
+                defaultValueYesnoVisibility = true;
+                break;
+
+            case 'textarea':
+                defaultValueTextareaVisibility = true;
+                break;
+
+            case 'media_image':
+                defaultValueTextVisibility = false;
+                break;
+            case 'price':
+                scopeVisibility = false;
+            default:
+                defaultValueTextVisibility = true;
+                break;
+        }
+
+        switch (currentValue) {
+            case 'media_image':
+                $('front_fieldset').previous().hide();
+                $('front_fieldset').hide();
+
+                setRowVisibility('is_required', false);
+                setRowVisibility('is_unique', false);
+                setRowVisibility('frontend_class', false);
+                break;
+
+        <?php foreach (Mage::helper('catalog')->getAttributeHiddenFields() as $type=>$fields): ?>
+            case '<?php echo $type; ?>':
+            <?php foreach ($fields as $one): ?>
+            <?php if ($one == '_front_fieldset'): ?>
+                $('front_fieldset').previous().hide();
+                $('front_fieldset').hide();
+            <?php elseif ($one == '_default_value'): ?>
+                defaultValueTextVisibility =
+                    defaultValueTextareaVisibility =
+                        defaultValueDateVisibility =
+                            defaultValueYesnoVisibility = false;
+            <?php elseif ($one == '_scope'): ?>
+                scopeVisibility = false;
+            <?php else: ?>
+                setRowVisibility('<?php echo $one; ?>', false);
+            <?php endif ?>
+            <?php endforeach ?>
+                break;
+        <?php endforeach ?>
+
+            default:
+                $('front_fieldset').previous().show();
+                $('front_fieldset').show();
+                setRowVisibility('is_required', true);
+                setRowVisibility('is_unique', true);
+                setRowVisibility('frontend_class', true);
+                setRowVisibility('is_configurable', true);
+                break;
+        }
+
+        setRowVisibility('default_value_text', defaultValueTextVisibility);
+        setRowVisibility('default_value_textarea', defaultValueTextareaVisibility);
+        setRowVisibility('default_value_date', defaultValueDateVisibility);
+        setRowVisibility('default_value_yesno', defaultValueYesnoVisibility);
+
+        var elems = document.getElementsByName('default[]');
+        for (var i = 0; i < elems.length; i++) {
+            elems[i].type = optionDefaultInputType;
+        }
+    }
+
+    function setRowVisibility(id, isVisible)
+    {
+        if ($(id)) {
+            var td = $(id).parentNode;
+            var tr = $(td.parentNode);
+
+            if (isVisible) {
+                tr.show();
+            } else {
+                tr.blur();
+                tr.hide();
+            }
+        }
+    }
+
+    function checkIsConfigurableVisibility()
+    {
+        if (!$('is_configurable') || !$('frontend_input')) return;
+        if ($F('frontend_input')=='select') {
+            setRowVisibility('is_configurable', true);
+        } else {
+            setRowVisibility('is_configurable', false);
+        }
+    }
+
+    function updateRequriedOptions()
+    {
+        if ($F('frontend_input')=='select' && $F('is_required')==1) {
+            $('option-count-check').addClassName('required-options-count');
+        } else {
+            $('option-count-check').removeClassName('required-options-count');
+        }
+    }
+
+    if($('frontend_input')){
+        Event.observe($('frontend_input'), 'change', updateRequriedOptions);
+        Event.observe($('frontend_input'), 'change', bindAttributeInputType);
+    }
+
+    if ($('is_required')) {
+        Event.observe($('is_required'), 'change', updateRequriedOptions);
+    }
+    bindAttributeInputType();
+    //]]>
+</script>
diff --git a/app/design/adminhtml/default/default/template/customer/attribute/js.phtml b/app/design/adminhtml/default/default/template/customer/attribute/js.phtml
new file mode 100644
index 00000000000..05f0a17211a
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/customer/attribute/js.phtml
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magento.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<script type="text/javascript">
+    //<![CDATA[
+    function saveAndContinueEdit(){
+        disableElements('save');
+        var activeTab = customer_attribute_tabsJsTabs.activeTab.id;
+        if (editForm.submit($('edit_form').action+'back/edit/tab/' + activeTab) == false) {
+            enableElements('save');
+        }
+        varienGlobalEvents.attachEventHandler('formValidateAjaxComplete', function (){
+            enableElements('save');
+        });
+    }
+
+    function saveAttribute(){
+        disableElements('save');
+        if (editForm.submit() == false){
+            enableElements('save');
+        }
+        varienGlobalEvents.attachEventHandler('formValidateAjaxComplete', function (){
+            enableElements('save');
+        });
+    }
+
+    function toggleApplyVisibility(select) {
+        if ($(select).value == 1) {
+            $(select).next('select').removeClassName('no-display');
+            $(select).next('select').removeClassName('ignore-validate');
+
+        } else {
+            $(select).next('select').addClassName('no-display');
+            $(select).next('select').addClassName('ignore-validate');
+            var options = $(select).next('select').options;
+            for( var i=0; i < options.length; i++) {
+                options[i].selected = false;
+            }
+        }
+    }
+
+    function checkOptionsPanelVisibility(){
+        if($('matage-options-panel')){
+            var panel = $('matage-options-panel');
+            if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect')){
+                panel.show();
+            }
+            else {
+                panel.hide();
+            }
+        }
+    }
+
+    function bindAttributeInputType()
+    {
+        checkOptionsPanelVisibility();
+        switchDefaultValueField();
+        checkIsConfigurableVisibility();
+        if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect' || $('frontend_input').value=='price')){
+            if($('backend_type') && $('backend_type').options){
+                for(var i=0;i<$('backend_type').options.length;i++){
+                    if($('backend_type').options[i].value=='int') $('backend_type').selectedIndex = i;
+                }
+            }
+        }
+
+        switch ($('frontend_input').value) {
+            case 'textarea':
+                $('frontend_class').value = '';
+                $('frontend_class').disabled = true;
+                break;
+            case 'text':
+                if (!$('frontend_class').getAttribute('readonly')) {
+                    $('frontend_class').disabled = false;
+                }
+                break;
+            default:
+                $('frontend_class').value = '';
+                $('frontend_class').disabled = true;
+        }
+    }
+
+    function disableApplyToValue(value)
+    {
+        var applyToSelect = $('apply_to');
+        for (i=0;i<applyToSelect.options.length;i++) {
+            if (value == applyToSelect.options[i].value) {
+                applyToSelect.options[i].disabled = true;
+                applyToSelect.options[i].selected = false;
+            }
+        }
+    }
+
+    function switchDefaultValueField()
+    {
+        if (!$('frontend_input')) {
+            return;
+        }
+
+        var currentValue = $('frontend_input').value;
+
+        var defaultValueTextVisibility = false;
+        var defaultValueTextareaVisibility = false;
+        var defaultValueDateVisibility = false;
+        var defaultValueYesnoVisibility = false;
+        var scopeVisibility = true;
+
+        switch (currentValue) {
+            case 'select':
+                optionDefaultInputType = 'radio';
+                break;
+
+            case 'multiselect':
+                optionDefaultInputType = 'checkbox';
+                break;
+
+            case 'date':
+                defaultValueDateVisibility = true;
+                break;
+
+            case 'boolean':
+                defaultValueYesnoVisibility = true;
+                break;
+
+            case 'textarea':
+                defaultValueTextareaVisibility = true;
+                break;
+
+            case 'media_image':
+                defaultValueTextVisibility = false;
+                break;
+            case 'price':
+                scopeVisibility = false;
+            default:
+                defaultValueTextVisibility = true;
+                break;
+        }
+
+        switch (currentValue) {
+            case 'media_image':
+                $('front_fieldset').previous().hide();
+                $('front_fieldset').hide();
+
+                setRowVisibility('is_required', false);
+                setRowVisibility('is_unique', false);
+                setRowVisibility('frontend_class', false);
+                break;
+
+        <?php foreach (Mage::helper('catalog')->getAttributeHiddenFields() as $type=>$fields): ?>
+            case '<?php echo $type; ?>':
+            <?php foreach ($fields as $one): ?>
+            <?php if ($one == '_front_fieldset'): ?>
+                $('front_fieldset').previous().hide();
+                $('front_fieldset').hide();
+            <?php elseif ($one == '_default_value'): ?>
+                defaultValueTextVisibility =
+                    defaultValueTextareaVisibility =
+                        defaultValueDateVisibility =
+                            defaultValueYesnoVisibility = false;
+            <?php elseif ($one == '_scope'): ?>
+                scopeVisibility = false;
+            <?php else: ?>
+                setRowVisibility('<?php echo $one; ?>', false);
+            <?php endif ?>
+            <?php endforeach ?>
+                break;
+        <?php endforeach ?>
+
+            default:
+                $('front_fieldset').previous().show();
+                $('front_fieldset').show();
+                setRowVisibility('is_required', true);
+                setRowVisibility('is_unique', true);
+                setRowVisibility('frontend_class', true);
+                setRowVisibility('is_configurable', true);
+                break;
+        }
+
+        setRowVisibility('default_value_text', defaultValueTextVisibility);
+        setRowVisibility('default_value_textarea', defaultValueTextareaVisibility);
+        setRowVisibility('default_value_date', defaultValueDateVisibility);
+        setRowVisibility('default_value_yesno', defaultValueYesnoVisibility);
+
+        var elems = document.getElementsByName('default[]');
+        for (var i = 0; i < elems.length; i++) {
+            elems[i].type = optionDefaultInputType;
+        }
+    }
+
+    function setRowVisibility(id, isVisible)
+    {
+        if ($(id)) {
+            var td = $(id).parentNode;
+            var tr = $(td.parentNode);
+
+            if (isVisible) {
+                tr.show();
+            } else {
+                tr.blur();
+                tr.hide();
+            }
+        }
+    }
+
+    function checkIsConfigurableVisibility()
+    {
+        if (!$('is_configurable') || !$('frontend_input')) return;
+        if ($F('frontend_input')=='select') {
+            setRowVisibility('is_configurable', true);
+        } else {
+            setRowVisibility('is_configurable', false);
+        }
+    }
+
+    function updateRequriedOptions()
+    {
+        if ($F('frontend_input')=='select' && $F('is_required')==1) {
+            $('option-count-check').addClassName('required-options-count');
+        } else {
+            $('option-count-check').removeClassName('required-options-count');
+        }
+    }
+
+    if($('frontend_input')){
+        Event.observe($('frontend_input'), 'change', updateRequriedOptions);
+        Event.observe($('frontend_input'), 'change', bindAttributeInputType);
+    }
+
+    if ($('is_required')) {
+        Event.observe($('is_required'), 'change', updateRequriedOptions);
+    }
+    bindAttributeInputType();
+    //]]>
+</script>
diff --git a/app/locale/en_US/Mage_Adminhtml.csv b/app/locale/en_US/Mage_Adminhtml.csv
index bef6df8654d..bd322991cf0 100644
--- a/app/locale/en_US/Mage_Adminhtml.csv
+++ b/app/locale/en_US/Mage_Adminhtml.csv
@@ -573,6 +573,7 @@
 "Manage Content","Manage Content"
 "Manage Currency Rates","Manage Currency Rates"
 "Manage Customers","Manage Customers"
+"Manage Customer Attributes","Manage Customer Attributes"
 "Manage Options (values of your attribute)","Manage Options (values of your attribute)"
 "Manage Ratings","Manage Ratings"
 "Manage Stores","Manage Stores"