diff --git a/src/Master.as b/src/Master.as
index 6c96ed8..fbe47e0 100644
--- a/src/Master.as
+++ b/src/Master.as
@@ -466,13 +466,14 @@
         login = PopUpManager.createPopUp(this.masterObject as Application,Login,true) as Login;
         login.funcs = this;
         login.tvMaster = this;
-        if (tvSO.data.userName != null)
-          login.username.text = tvSO.data.userName;
+        if (tvSO.data.username != null)
+          login.username.text = tvSO.data.username;
           
-        if ((guestUser == "true") && (login.username.text == null)) {
+        if ((guestUser == "true") && (login.username.length == 0)) {
       	  var rndID:String;
       	  rndID = new Date().getTime().toString();
           login.username.text = "Guest" + rndID.substr(rndID.length-4,rndID.length);
+          login.selChan.selectedIndex = 0;
           login.doAuth();  	
           }
           
@@ -481,7 +482,11 @@
       } /* End doLogin() */
     public function authUser(userN:String,channel:String):void {
       userName = userN;
-      tvSO.data.userName = userN;
+      if (userN.indexOf("Guest") == 0)
+        tvSO.data.username = "";        
+      else
+        tvSO.data.username = userN;
+
       currentChannel = channel;
       if ((tvSO.data.quickTips == null) || (tvSO.data.quickTips == 0))
         tuveShowTW();
diff --git a/src/tuveNetwork.as b/src/tuveNetwork.as
index b341ab2..d2a6a98 100644
--- a/src/tuveNetwork.as
+++ b/src/tuveNetwork.as
@@ -238,7 +238,7 @@
           dataArray = data.split(":");
           if (dataArray[1] == tvMaster.userName) {
        	    tvMaster.userName = dataArray[2];
-            tvMaster.tvSO.data.userName = dataArray[2];
+            tvMaster.tvSO.data.username = dataArray[2];
             }
           for (i=0;i<tvMaster.userList.length();i++) {
             if (dataArray[1] == tvMaster.userList[i].@label) {