--- usr/www/avme/html/de/js/basis.js
+++ usr/www/avme/html/de/js/basis.js
@@ -104,16 +104,16 @@
 var menu = readCookie("menu");
 var page = readCookie("page");
 if (menu == "konfig") {
-jslGoTo("konfig", "home");
+jslGoTo("enhsettings", "enhsettings");
 }
 else if (menu == "software") {
-jslGoTo("software", "extern");
+jslGoTo("enhsettings", "enhsettings");
 }
 else if (menu == "enhsettings") {
 jslGoTo("enhsettings", "enhsettings");
 }
 else {
-jslGoTo("konfig", "home");
+jslGoTo("enhsettings", "enhsettings");
 }
 }
 function GoToSitemap()
--- usr/www/avme/html/de/home/sitemap.html
+++ usr/www/avme/html/de/home/sitemap.html
@@ -19,18 +19,6 @@
 <p class="ml10"><a href="javascript:jslGoTo('home', 'net');">{?txtNetwork?}</a></p>
 <p class="ml10"><a href="javascript:jslGoTo('home', 'syslog');">{?de.home.sitemap.html:9348?}</a></p>
 </div>
-<div class="gelb">
-<p class="mb5 fett"><a href="javascript:jslGoTo('konfig', 'home');">{?txtAssi?}</a></p>
-<? if eq $var:showFonLotse 1 `
-<p id="SitemapFonItem" class="ml10"><a href="javascript:DoFonLotse();">{?de.home.sitemap.html:90SitemapText7?}</a></p>
-` ?>
-<p id="SitemapFonVoipItem" class="ml10"><a href="javascript:DoVoipFonLotse();">{?de.home.sitemap.html:85SitemapText6?}</a></p>
-<? if eq $var:showInternetLotse 1 `
-<p class="ml10"><a href="javascript:DoInternetLotse();">{?de.home.sitemap.html:80SitemapText5?}</a></p>
-` ?>
-<p class="ml10"><a href="javascript:DoSaveLotse();">{?txtSaveSettings?}</a></p>
-<p class="ml10"><a href="javascript:DoFirmwareLotse();">{?txtFWUpdate?}</a></p>
-</div>
 <? setvariable var:title "{?txtINet?}" ?>
 <? setvariable var:showsubmenu 1 ?>
 <? if eq '<? query wlan:settings/WDS_enabled ?>' '1' `
--- usr/www/avme/html/de/menus/menu2_konfig.html
+++ usr/www/avme/html/de/menus/menu2_konfig.html
@@ -10,18 +10,6 @@
 <? setvariable var:showmoremenu 0 ?>
 <? if neq $var:menu 'software' `<? setvariable var:showmoremenu 1 ?>` ?>
 <? if eq '$var:ShowAssiMenu' 1 `
-<li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="<? echo `$var:aktivpfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?txtAssi?}</a><span class="PTextOnly">{?txtAssi?}</span></li>
-<? if eq $var:showFonLotse 1 `
-<li class="LMenuitem" id="FonLotseMenuItem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFonLotse();">{?txtDevices?}</a><span class="PTextOnly">{?txtDevices?}</span></li>
-` ?>
-<li class="LMenuitem" id="VoipFonLotseMenuItem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoVoipFonLotse();">{?txtNumbers?}</a><span class="PTextOnly">{?txtNumbers?}</span></li>
-<? if eq $var:showInternetLotse 1 `
-<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoInternetLotse();">{?de.menus.menu2_konfig.html:40Ersteinrichtung?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:45?}</span></li>
-` ?>
-<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoSaveLotse();">{?de.menus.menu2_konfig.html:5506?}</a><span class="PTextOnly">{?de.menus.menu2_konfig.html:3950?}</span></li>
-<li class="LMenuitem"><img class="LMenuPfeil" src="<? echo $var:subpfeil ?>"><a href="javascript:DoFirmwareLotse();">{?txtFWUpdate?}</a><span class="PTextOnly">{?txtFWUpdate?}</span></li>
-<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo $var:pfeil ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?txtAdvancedSettings?}</a><span class="PTextOnly">{?txtAdvancedSettings?}</span></li>
-<li class="LMenuitemTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?txtPrograms?}</a><span class="PTextOnly">{?txtPrograms?}</span></li>
 ` `
 <? if eq '$var:showmoremenu' '1' `
 <script type="text/javascript">setMenuPageCookie("enhsettings","enhsettings");</script>
@@ -55,7 +43,6 @@
 ` ?>
 <? if eq '$var:menu' 'software' `
 <script type="text/javascript">setMenuPageCookie("software","extern");</script>
-<li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('konfig','home')">{?txtAssi?}</a><span class="PTextOnly">{?txtAssi?}</span></li>
 <li class="LMenuitemTop"><img class="LMenuPfeil" src="<? echo `$var:pfeil` ?>"><a href="javascript:jslGoTo('enhsettings','enhsettings')">{?txtAdvancedSettings?}</a><span class="PTextOnly">{?txtAdvancedSettings?}</span></li>
 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">{?txtPrograms?}</a><span class="PTextOnly">{?txtPrograms?}</span></li>
 ` ?>
--- usr/www/avme/html/logincheck.html
+++ usr/www/avme/html/logincheck.html
@@ -237,20 +237,9 @@
 var user = "<? query connection0:settings/username ?>";
 var pass = "<? query connection0:settings/password ?>";
 var type = "<? query connection0:settings/type ?>";
-if (oem == "otwo") {
-var BSA_ON=jslGetValue("uiPostBSA_ON");
-if (BSA_ON=="1" && user.indexOf("o2@") == 0) {
-jslSetValue("uiPppProvider","O2");
-jslSetValue("uiO2Mode","2");
-jslSetValue("uiPostBSA_ON","0");
-jslSetValue("uiPostPageName", "first_ISP_o2");
-jslSetValue("uiPostMenu", "first");
-return true;
-}
-}
 if (user=="" && pass=="" && type=="bridge") {
-jslSetValue("uiPostPageName", "first_Start_ISP");
-jslSetValue("uiPostMenu", "first");
+jslSetValue("uiPostPageName", "home");
+jslSetValue("uiPostMenu", "home");
 return true;
 }
 }