Index: /src/router/httpd/visuals/dd-wrt.c
===================================================================
--- /src/router/httpd/visuals/dd-wrt.c (revision 12428)
+++ /src/router/httpd/visuals/dd-wrt.c (revision 12436)
@@ -3869,4 +3869,9 @@
 			// showOption (wp, "wl_basic.wifi_bonding", "wifi_bonding");
 #endif
+#ifdef HAVE_REGISTER
+	int cpeonly = iscpe();
+#else
+	int cpeonly = 0;
+#endif
 			websWrite(wp,
 				  "<div class=\"setting\"><div class=\"label\"><script type=\"text/javascript\">Capture(wl_basic.label)</script></div><select name=\"%s\" >\n",
@@ -3874,4 +3879,6 @@
 			websWrite(wp,
 				  "<script type=\"text/javascript\">\n//<![CDATA[\n");
+			if (!cpeonly)
+			{
 			websWrite(wp,
 				  "document.write(\"<option value=\\\"ap\\\" %s >\" + wl_basic.ap + \"</option>\");\n",
@@ -3879,4 +3886,5 @@
 					      "ap") ?
 				  "selected=\\\"selected\\\"" : "");
+			}
 			websWrite(wp,
 				  "document.write(\"<option value=\\\"sta\\\" %s >\" + wl_basic.client + \"</option>\");\n",
@@ -3891,4 +3899,5 @@
 				  "selected=\\\"selected\\\"" : "");
 #endif
+			if (!cpeonly)
 			websWrite(wp,
 				  "document.write(\"<option value=\\\"infra\\\" %s >\" + wl_basic.adhoc + \"</option>\");\n",
@@ -3897,4 +3906,6 @@
 				  "selected=\\\"selected\\\"" : "");
 #ifndef HAVE_MADWIFI
+			if (!cpeonly)
+			{
 			websWrite(wp,
 				  "document.write(\"<option value=\\\"apsta\\\" %s >\" + wl_basic.repeater + \"</option>\");\n",
@@ -3908,4 +3919,5 @@
 					      "apstawet") ?
 				  "selected=\\\"selected\\\"" : "");
+			}
 //#endif
 #else
@@ -3915,4 +3927,6 @@
 					      "wdssta") ?
 				  "selected=\\\"selected\\\"" : "");
+			if (!cpeonly)
+			{
 			websWrite(wp,
 				  "document.write(\"<option value=\\\"wdsap\\\" %s >\" + wl_basic.wdsap + \"</option>\");\n",
@@ -3920,4 +3934,5 @@
 					      "wdsap") ?
 				  "selected=\\\"selected\\\"" : "");
+			}
 #endif
 			websWrite(wp, "//]]>\n</script>\n");
@@ -4408,5 +4423,6 @@
 	websWrite(wp, "</fieldset>\n");
 	websWrite(wp, "<br />\n");
-	show_virtualssid(wp, prefix);
+	if (!iscpe())
+	    show_virtualssid(wp, prefix);
 }
 
Index: /src/router/httpd/visuals/ejs.c
===================================================================
--- /src/router/httpd/visuals/ejs.c (revision 12361)
+++ /src/router/httpd/visuals/ejs.c (revision 12436)
@@ -1432,5 +1432,9 @@
 	if (!isregistered_real())
 		registered = 0;
-#endif
+	int cpeonly = iscpe();
+#else
+	int cpeonly = 0;
+#endif
+
 #ifdef HAVE_MADWIFI
 #ifdef HAVE_NOWIFI
@@ -1657,6 +1661,5 @@
 				    (menu[i][j], "Wireless_Advanced", 17))
 					j++;
-				if (!wifi
-				    && !strncmp(menu[i][j], "Wireless_WDS", 12))
+				if (!wifi && !iscpeonly && !strncmp(menu[i][j], "Wireless_WDS", 12))
 					j++;
 				if (!wifi
Index: /src/router/httpd/httpd.c
===================================================================
--- /src/router/httpd/httpd.c (revision 12435)
+++ /src/router/httpd/httpd.c (revision 12436)
@@ -966,5 +966,5 @@
 			     && nvram_match("http_passwd", DEFAULT_PASS))
 			    || nvram_match("http_username", "")
-			    || nvram_match("http_passwd", "admin")) && !endswith(file, "About.htm")){
+			    || nvram_match("http_passwd", "admin")) && !endswith(file, "register.asp")){
 				changepassword = 1;
 				if (endswith(file, ".asp"))
Index: /src/router/libutils/utils.c
===================================================================
--- /src/router/libutils/utils.c (revision 12432)
+++ /src/router/libutils/utils.c (revision 12436)
@@ -699,5 +699,5 @@
 	getBoardMAC(mac);
 	if (!strncmp(mac, "00:19:3B", 8) || !strncmp(mac, "00:02:6F", 8)
-	    || !strncmp(mac, "00:15:6D", 8)) {
+	    || !strncmp(mac, "00:15:6D", 8) || !strncmp(mac, "00:C0:CA", 8)) {
 		fprintf(stderr, "unsupported board\n");
 		sys_reboot();
Index: /src/router/services/networking/madwifi.c
===================================================================
--- /src/router/services/networking/madwifi.c (revision 12308)
+++ /src/router/services/networking/madwifi.c (revision 12436)
@@ -966,4 +966,13 @@
 	sprintf(wifivifs, "ath%d_vifs", count);
 	sprintf(wl, "ath%d_mode", count);
+#ifdef HAVE_REGISTER
+int cpeonly = iscpe();
+#else
+int cpeonly=0;
+#endif
+	if (cpeonly && nvram_match(wl,"ap"))
+	    {
+	    nvram_set(wl,"sta");
+	    }
 	sprintf(channel, "ath%d_channel", count);
 	sprintf(power, "ath%d_txpwrdbm", count);