Index: lams_learning/web/includes/presence.js
===================================================================
diff -u -r0e5777f5ca5d43661be2751d2ee1955a871c79ea -r0df8bac692a00676cdb2ecc8205b762f7699af41
--- lams_learning/web/includes/presence.js	(.../presence.js)	(revision 0e5777f5ca5d43661be2751d2ee1955a871c79ea)
+++ lams_learning/web/includes/presence.js	(.../presence.js)	(revision 0df8bac692a00676cdb2ecc8205b762f7699af41)
@@ -134,15 +134,26 @@
 	return this.users;
 }
 
+function CloneAndEncodeUser(user){
+	var newUser = new Object();
+	var newUserNick;
+	newUser.status = "" + user.status;
+	newUser.nick = "" + user.nick;
+	newUser.nick = encodeURI(newUser.nick);
+	return newUser;
+}
+
 function UpdateRosterDisplay() {
 	if(FROMFLASH){
 		// send users to flash
 		var availableUsers = [];
+		
 		for (var i = 0; i < this.users.length; i++) {
 			if (this.users[i].status != "unavailable") {
-				availableUsers[availableUsers.length] = correctPresenceName(this.users[i]);
+				availableUsers[availableUsers.length] = CloneAndEncodeUser(this.users[i]);
 			}
 		}
+		
 		flashProxy.call("sendUsersToFlash", availableUsers);
 	}
 	else {
@@ -400,9 +411,10 @@
 			PASSWORD = password;
 			RESOURCE = resource;
 			XMPPDOMAIN = presenceServerUrl;
-			NICK = nickname;
+			NICK = unescape(nickname);
 			CONFERENCEROOM = chatroom + "@conference." + presenceServerUrl;
 			FROMFLASH = fromFlash;
+			
 			// debug statement for connection information
 			//alert(HTTPBASE + USERNAME + PASSWORD + RESOURCE + XMPPDOMAIN + NICK + CONFERENCEROOM + FROMFLASH);
 		}