diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 8597cf0304..c97317437d 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -2791,7 +2791,7 @@ class addressbook_ui extends addressbook_bo
 		$preserve['old_owner'] = $content['owner'];
 		unset($preserve['jpegphoto'], $content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
 		$this->tmpl->setElementAttribute('tabs', 'add_tabs', true);
-		$tabs =& $this->tmpl->getElementAttribute('tabs', 'tabs');
+		$tabs =& $this->tmpl->getElementAttribute('tabs', 'extraTabs');
 		if (($first_call = !isset($tabs)))
 		{
 			$tabs = array();
diff --git a/api/src/Etemplate/Widget/Tabbox.php b/api/src/Etemplate/Widget/Tabbox.php
index 91fdd8e584..d55ff2b2e4 100644
--- a/api/src/Etemplate/Widget/Tabbox.php
+++ b/api/src/Etemplate/Widget/Tabbox.php
@@ -47,11 +47,6 @@ class Tabbox extends Etemplate\Widget
 		$form_name = self::form_name($params[0], $this->id, $params[1]);
 
 		// Make sure additional tabs are processed for any method
-		if($tabs = self::getElementAttribute($form_name, 'tabs'))
-		{
-			// tabs is not usable in webComponent, need to use extraTabs
-			self::setElementAttribute($form_name, 'extraTabs', $tabs);
-		}
 		if(!($tabs =& self::getElementAttribute($form_name, 'extraTabs')))
 		{
 			$tabs = $this->attrs['extraTabs'];
diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 18ad2903b4..e003b0a96b 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -1600,7 +1600,7 @@ class filemanager_ui
 			// add to existing tabs in template
 			$tpl->setElementAttribute('tabs', 'add_tabs', true);
 
-			$tabs =& $tpl->getElementAttribute('tabs','tabs');
+			$tabs =& $tpl->getElementAttribute('extraTabs', 'tabs');
 			if (true) $tabs = array();
 
 			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
diff --git a/preferences/inc/class.preferences_password.inc.php b/preferences/inc/class.preferences_password.inc.php
index 7e8d0c00dd..d74598741d 100644
--- a/preferences/inc/class.preferences_password.inc.php
+++ b/preferences/inc/class.preferences_password.inc.php
@@ -168,7 +168,7 @@ class preferences_password
 		];
 
 		$tmpl->setElementAttribute('tabs', 'add_tabs', true);
-		$tabs =& $tmpl->getElementAttribute('tabs', 'tabs');
+		$tabs =& $tmpl->getElementAttribute('tabs', 'extraTabs');
 		if (($first_call = !isset($tabs)))
 		{
 			$tabs = array();
diff --git a/preferences/inc/class.preferences_settings.inc.php b/preferences/inc/class.preferences_settings.inc.php
index ed888f93bf..373f91e8bc 100644
--- a/preferences/inc/class.preferences_settings.inc.php
+++ b/preferences/inc/class.preferences_settings.inc.php
@@ -567,16 +567,17 @@ class preferences_settings
 		// defining used tabs on run-time
 		if ($tabs)
 		{
-			$tpl->setElementAttribute('tabs', 'tabs', $tabs);
+			$tpl->setElementAttribute('tabs', 'extraTabs', $tabs);
 		}
 		else
 		{
 			// Modifications are kept in the request, so reset to just one
-			$tpl->setElementAttribute('tabs', 'tabs', array(array(
-				'id' => 'tab1',
-				'template' => 'preferences.settings.tab1',
-				'label' => 'general settings'
-			)));
+			$tpl->setElementAttribute('tabs', 'extraTabs', array(
+				array(
+					'id'       => 'tab1',
+					'template' => 'preferences.settings.tab1',
+					'label'    => 'general settings'
+				)));
 		}
 
 		$content['appname'] = $appname;