diff --git a/admin-dev/themes/default/template/controllers/addons_my_account/content.tpl b/admin-dev/themes/default/template/controllers/addons_my_account/content.tpl
deleted file mode 100644
index d551215c3..000000000
--- a/admin-dev/themes/default/template/controllers/addons_my_account/content.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{*
-* 2007-2012 PrestaShop
-*
-* 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.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@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA
-*  @version  Release: $Revision$
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-<iframe frameborder="no" style="margin:0px;padding:0px;width:960px;height:920px" src="http://addons.prestashop.com/iframe/myaccount.php?parentUrl={$parentDomain}"></iframe>
-<div class="clear">&nbsp;</div>
diff --git a/cache/class_index.php b/cache/class_index.php
index 8fb3e8659..85e0ba68a 100644
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -22,7 +22,6 @@
   'AdminAddonsCatalogController' => 'override/controllers/admin/AdminAddonsCatalogController.php',
   'AdminAddonsCatalogControllerCore' => 'controllers/admin/AdminAddonsCatalogController.php',
   'AdminAddonsMyAccountController' => 'override/controllers/admin/AdminAddonsMyAccountController.php',
-  'AdminAddonsMyAccountControllerCore' => 'controllers/admin/AdminAddonsMyAccountController.php',
   'AdminAddressesController' => 'override/controllers/admin/AdminAddressesController.php',
   'AdminAddressesControllerCore' => 'controllers/admin/AdminAddressesController.php',
   'AdminAdminPreferencesController' => 'override/controllers/admin/AdminAdminPreferencesController.php',
diff --git a/controllers/admin/AdminAddonsMyAccountController.php b/controllers/admin/AdminAddonsMyAccountController.php
deleted file mode 100644
index 4e799f457..000000000
--- a/controllers/admin/AdminAddonsMyAccountController.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
-* 2007-2012 PrestaShop
-*
-* 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@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA
-*  @version  Release: $Revision: 6844 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-class AdminAddonsMyAccountControllerCore extends AdminController
-{
-	public function initContent()
-	{
-		$this->context->smarty->assign('parentDomain', Tools::getHttpHost(true).substr($_SERVER['REQUEST_URI'], 0, -1 * strlen(basename($_SERVER['REQUEST_URI']))));
-		parent::initContent();
-	}
-}
-
-
diff --git a/install-dev/data/img/t/AdminAddonsMyAccount.gif b/install-dev/data/img/t/AdminAddonsMyAccount.gif
deleted file mode 100644
index 2104e0bed..000000000
Binary files a/install-dev/data/img/t/AdminAddonsMyAccount.gif and /dev/null differ
diff --git a/install-dev/data/xml/tab.xml b/install-dev/data/xml/tab.xml
index d37c759e1..9d0c171a0 100644
--- a/install-dev/data/xml/tab.xml
+++ b/install-dev/data/xml/tab.xml
@@ -189,9 +189,6 @@
     <tab id="Modules_Themes_Catalog" id_parent="Modules" active="1">
       <class_name>AdminAddonsCatalog</class_name>
     </tab>
-    <tab id="My_Account" id_parent="Modules" active="1">
-      <class_name>AdminAddonsMyAccount</class_name>
-    </tab>
     <tab id="Positions" id_parent="Modules" active="1">
       <class_name>AdminModulesPositions</class_name>
     </tab>
diff --git a/install-dev/langs/de/data/tab.xml b/install-dev/langs/de/data/tab.xml
index 86755ad79..2cb1469ca 100644
--- a/install-dev/langs/de/data/tab.xml
+++ b/install-dev/langs/de/data/tab.xml
@@ -61,7 +61,6 @@
   <tab id="Translations" name="&#xDC;bersetzungen"/>
   <tab id="Modules_1" name="Module"/>
   <tab id="Modules_Themes_Catalog" name="Module und Themenkatalog"/>
-  <tab id="My_Account" name="Mein Konto"/>
   <tab id="Positions" name="Positionen"/>
   <tab id="Payment" name="Zahlung"/>
   <tab id="General" name="General"/>
diff --git a/install-dev/langs/en/data/tab.xml b/install-dev/langs/en/data/tab.xml
index 100acb825..ab8ee897f 100644
--- a/install-dev/langs/en/data/tab.xml
+++ b/install-dev/langs/en/data/tab.xml
@@ -61,7 +61,6 @@
   <tab id="Translations" name="Translations"/>
   <tab id="Modules_1" name="Modules"/>
   <tab id="Modules_Themes_Catalog" name="Modules &amp; Themes Catalog"/>
-  <tab id="My_Account" name="My Account"/>
   <tab id="Positions" name="Positions"/>
   <tab id="Payment" name="Payment"/>
   <tab id="General" name="General"/>
diff --git a/install-dev/langs/es/data/tab.xml b/install-dev/langs/es/data/tab.xml
index 7f45c33f2..83ada8a0f 100644
--- a/install-dev/langs/es/data/tab.xml
+++ b/install-dev/langs/es/data/tab.xml
@@ -61,7 +61,6 @@
   <tab id="Translations" name="Traducciones"/>
   <tab id="Modules_1" name="M&#xF3;dulos"/>
   <tab id="Modules_Themes_Catalog" name="Modules &amp; Themes Catalog"/>
-  <tab id="My_Account" name="My Account"/>
   <tab id="Positions" name="Posiciones"/>
   <tab id="Payment" name="Pago"/>
   <tab id="General" name="General"/>
diff --git a/install-dev/langs/fr/data/tab.xml b/install-dev/langs/fr/data/tab.xml
index 5cc005610..9a1cfc005 100644
--- a/install-dev/langs/fr/data/tab.xml
+++ b/install-dev/langs/fr/data/tab.xml
@@ -61,7 +61,6 @@
   <tab id="Translations" name="Traductions"/>
   <tab id="Modules_1" name="Modules"/>
   <tab id="Modules_Themes_Catalog" name="Catalogue de modules et th&#xE8;mes"/>
-  <tab id="My_Account" name="Mon compte"/>
   <tab id="Positions" name="Positions"/>
   <tab id="Payment" name="Paiement"/>
   <tab id="General" name="G&#xE9;n&#xE9;rales"/>
diff --git a/install-dev/langs/it/data/tab.xml b/install-dev/langs/it/data/tab.xml
index ded412d58..4303ce2a6 100644
--- a/install-dev/langs/it/data/tab.xml
+++ b/install-dev/langs/it/data/tab.xml
@@ -61,7 +61,6 @@
   <tab id="Translations" name="Traduzioni"/>
   <tab id="Modules_1" name="Moduli"/>
   <tab id="Modules_Themes_Catalog" name="Moduli &amp; Temi catalogo"/>
-  <tab id="My_Account" name="Il mio Account"/>
   <tab id="Positions" name="Posizioni"/>
   <tab id="Payment" name="Pagamento"/>
   <tab id="General" name="General"/>
diff --git a/override/classes/AdminTab.php b/override/classes/AdminTab.php
index edb772765..46cc35cd9 100644
--- a/override/classes/AdminTab.php
+++ b/override/classes/AdminTab.php
@@ -1,7 +1,6 @@
-<?php
-
-abstract class AdminTab extends AdminTabCore
-{
-
-}
-
+<?php
+
+class AdminTab extends AdminTabCore
+{
+	public static $currentIndex;
+}
\ No newline at end of file
diff --git a/override/classes/controller/FrontController.php b/override/classes/controller/FrontController.php
index 8692c6241..cedcb362a 100644
--- a/override/classes/controller/FrontController.php
+++ b/override/classes/controller/FrontController.php
@@ -1,7 +1,36 @@
 <?php
+/*
+* 2007-2012 PrestaShop
+*
+* 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@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
 
 class FrontController extends FrontControllerCore
 {
-
-}
-
+	public function run()
+	{		
+		parent::run();
+		
+		Compatibility::resetOverride();
+	}
+}
\ No newline at end of file