diff --git a/CASA-auth-token/yast2-casa-ats/package/yast2-casa-ats.changes b/CASA-auth-token/yast2-casa-ats/package/yast2-casa-ats.changes
index ee875618..4877ac4a 100644
--- a/CASA-auth-token/yast2-casa-ats/package/yast2-casa-ats.changes
+++ b/CASA-auth-token/yast2-casa-ats/package/yast2-casa-ats.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar  7 12:23:37 MST 2007 - rpartridge@novell.com
+
+- Changed default firewall port behavior to on (#236292)
+- Updated module name and description in YaST2 control center and
+  moved to Network Services group (#236298)
+
 -------------------------------------------------------------------
 Mon Feb 12 11:04:55 MST 2007 - jluciani@novell.com
 
diff --git a/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp b/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp
index 7e009d92..1cc90b1f 100644
--- a/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp
+++ b/CASA-auth-token/yast2-casa-ats/src/CasaAts.ycp
@@ -144,7 +144,15 @@ global boolean Read() {
         Settings["CONFIG_CASAATS_REALM"] = (string)SCR::Read(.sysconfig.casa-ats.CONFIG_CASAATS_REALM);
         Settings["CONFIG_CASAATS_HOST"] = (string)SCR::Read(.sysconfig.casa-ats.CONFIG_CASAATS_HOST);
         Settings["CONFIG_CASAATS_PROXY_USERNAME"] = (string)SCR::Read(.sysconfig.casa-ats.CONFIG_CASAATS_PROXY_USERNAME);
-        Settings["CONFIG_CASAATS_OPEN_PORT"] = tolower((string)SCR::Read(.sysconfig.casa-ats.CONFIG_CASAATS_OPEN_PORT)) == "yes";
+        string open_port = tolower((string)SCR::Read(.sysconfig.casa-ats.CONFIG_CASAATS_OPEN_PORT));
+        if (open_port != nil && open_port != "")
+        {
+            Settings["CONFIG_CASAATS_OPEN_PORT"] = open_port == "yes";
+        }
+        else
+        {
+            Settings["CONFIG_CASAATS_OPEN_PORT"] = true;
+        }
     }
     /* Error message */
     if(false) Report::Error(_("Cannot read settings file."));
@@ -219,7 +227,7 @@ global boolean Write() {
     SCR::Write(.sysconfig.casa-ats.CONFIG_CASAATS_REALM, Settings["CONFIG_CASAATS_REALM"]:"");
     SCR::Write(.sysconfig.casa-ats.CONFIG_CASAATS_HOST, Settings["CONFIG_CASAATS_HOST"]:"");
     SCR::Write(.sysconfig.casa-ats.CONFIG_CASAATS_PROXY_USERNAME, Settings["CONFIG_CASAATS_PROXY_USERNAME"]:"");
-    SCR::Write(.sysconfig.casa-ats.CONFIG_CASAATS_OPEN_PORT, Settings["CONFIG_CASAATS_OPEN_PORT"]:false ? "yes" : "no");
+    SCR::Write(.sysconfig.casa-ats.CONFIG_CASAATS_OPEN_PORT, Settings["CONFIG_CASAATS_OPEN_PORT"]:true ? "yes" : "no");
     /* Error message */
     if(false) Report::Error (_("Cannot write settings."));
     sleep(sl);
diff --git a/CASA-auth-token/yast2-casa-ats/src/casa-ats.desktop b/CASA-auth-token/yast2-casa-ats/src/casa-ats.desktop
index fcfc984b..d83bfb04 100644
--- a/CASA-auth-token/yast2-casa-ats/src/casa-ats.desktop
+++ b/CASA-auth-token/yast2-casa-ats/src/casa-ats.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
+Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
 
 X-KDE-ModuleType=Library
 X-KDE-RootOnly=true
@@ -8,7 +8,7 @@ X-KDE-HasReadOnlyMode=true
 X-KDE-Library=yast2
 X-SuSE-YaST-Call=casa-ats
 
-X-SuSE-YaST-Group=Misc
+X-SuSE-YaST-Group=Net_advanced
 X-SuSE-YaST-Argument=
 X-SuSE-YaST-RootOnly=true
 X-SuSE-YaST-AutoInst=
@@ -19,6 +19,6 @@ X-SuSE-YaST-AutoInstResource=casa-ats
 Icon=yast-casa-ats
 Exec=/sbin/yast2 casa-ats 
 
-Name=CasaAts
-GenericName=casa-ats
+Name=CASA Authentication Token Service
+GenericName=Configure the CASA Authentication Token Service
 X-KDE-SubstituteUID=true
diff --git a/CASA-auth-token/yast2-casa-ats/src/dialogs.ycp b/CASA-auth-token/yast2-casa-ats/src/dialogs.ycp
index b08d527b..21eedd1e 100644
--- a/CASA-auth-token/yast2-casa-ats/src/dialogs.ycp
+++ b/CASA-auth-token/yast2-casa-ats/src/dialogs.ycp
@@ -55,7 +55,7 @@ any ATSInfoDialog () {
     string host = CasaAts::Settings["CONFIG_CASAATS_HOST"]:"";
     string proxy_username = CasaAts::Settings["CONFIG_CASAATS_PROXY_USERNAME"]:"";
     string proxy_password = CasaAts::Settings["CONFIG_CASAATS_PROXY_PASSWORD"]:"";
-    boolean open_port = CasaAts::Settings["CONFIG_CASAATS_OPEN_PORT"]:false;
+    boolean open_port = CasaAts::Settings["CONFIG_CASAATS_OPEN_PORT"]:true;
 
     /* CasaAts ATSInfo dialog contents */
     term contents =