diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2.normal.template.tsf b/zefie_wtvp_minisrv/includes/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2.normal.template.tsf
index 458dbc4b..8e0b1cca 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2.normal.template.tsf
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2.normal.template.tsf
@@ -24,7 +24,7 @@ InitGeneratedValues()
 
 LoginToPOP(int Fb, int Gb)
 {
-	return PAPChat("wtv_%s", 0);
+	return PAPChat("wtv_%s", 2);
 }
 
 ChatWithIndexedProvider(int idx)
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-1800/preregister.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-1800/preregister.js
index 78bb1db1..0e28670b 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-1800/preregister.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-1800/preregister.js
@@ -84,14 +84,14 @@ if (session_data.data_store.wtvsec_login) {
 				if (session_data.get("wtv-open-access")) file_path = wtvshared.getServiceDep("/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok", true);
 				else file_path = wtvshared.getServiceDep("/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok", true);
 				*/
-				if (wtvshared.isMiniBrowser(session_data)) {
-					if (session_data.get("wtv-open-access")) file_path = wtvshared.getServiceDep("/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok", true);
-					else file_path = wtvshared.getServiceDep("/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok", true);
-				} else {
+				//if (wtvshared.isMiniBrowser(session_data)) {
+				//	if (session_data.get("wtv-open-access")) file_path = wtvshared.getServiceDep("/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok", true);
+				//	else file_path = wtvshared.getServiceDep("/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok", true);
+				//} else {
 					template = wtvshared.getServiceDep("/wtv-1800/tellyscripts/base.template.tsf")
 					if (session_data.get("wtv-open-access")) template += wtvshared.getServiceDep("/wtv-1800/tellyscripts/LC2/LC2.openisp.template.tsf");
 					else template += wtvshared.getServiceDep("/wtv-1800/tellyscripts/LC2/LC2.normal.template.tsf");
-				}
+				//}
 				break;
 
 			case "US-DTV-disk-0MB-32MB-softmodem-CPU5230":
@@ -112,12 +112,11 @@ if (session_data.data_store.wtvsec_login) {
 
 			case "bf0app":
 				prereg_contype = "text/tellyscript";
+				template_preprocessor.CLASSIC = true;
 				// if wtv-open-access: true then client expects OpenISP
 				template = wtvshared.getServiceDep("/wtv-1800/tellyscripts/base.template.tsf")
-				template_preprocessor.CLASSIC = true;
 				if (session_data.get("wtv-open-access")) template += wtvshared.getServiceDep("/wtv-1800/tellyscripts/bf0app/bf0app.openisp.template.tsf");
 				else template += wtvshared.getServiceDep("/wtv-1800/tellyscripts/bf0app/bf0app.normal.template.tsf");
-				//else file_path = wtvshared.getServiceDep("/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok", true);
 				break;
 
 			// the following are not yet zefie generated and may have an unknown username/password attached