diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
index 520cb4e6ce..5293dfb8d1 100644
--- a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
+++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
@@ -34,7 +34,7 @@ trait UsersApp {
   }
   
   def handleUserConnectedToGlobalAudio(msg: UserConnectedToGlobalAudio) {
-    val user = users.getUserWithExternalId(msg.userid)
+    val user = users.getUser(msg.userid)
     user foreach {u =>
       val vu = u.voiceUser.copy(talking=false)
       val uvo = u.copy(listenOnly=true, voiceUser=vu)
@@ -45,7 +45,7 @@ trait UsersApp {
   }
   
   def handleUserDisconnectedFromGlobalAudio(msg: UserDisconnectedFromGlobalAudio) {
-    val user = users.getUserWithExternalId(msg.userid)
+    val user = users.getUser(msg.userid)
     user foreach {u =>
       val uvo = u.copy(listenOnly=false)
       users.addUser(uvo)
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
index 42778a1605..b83e877b70 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
@@ -50,7 +50,7 @@ package org.bigbluebutton.modules.phone.managers {
 		private var outgoingNetStream:NetStream = null;
 		private var username:String;
 		private var uri:String;
-    private var externUserId:String;
+		private var userId:String;
 		private var uid:String;
 		private var meetingId:String;
 		
@@ -78,13 +78,13 @@ package org.bigbluebutton.modules.phone.managers {
 			return netConnection;
 		}
 		
-    public function setup(uid:String, externUserId:String, username:String, meetingId:String, uri:String):void {	
-      trace(LOG + "Setup uid=[" + uid + "] extuid=[" + externUserId + "] name=[" + username + "] uri=[" + uri + "]");
+    public function setup(uid:String, userId:String, username:String, meetingId:String, uri:String):void {
+      trace(LOG + "Setup uid=[" + uid + "] extuid=[" + userId + "] name=[" + username + "] uri=[" + uri + "]");
       this.uid = uid;	
       this.username  = username;
       this.meetingId = meetingId;
       this.uri   = uri;
-      this.externUserId = externUserId;
+      this.userId = userId;
     }
     
 		public function connect():void {				
@@ -101,7 +101,7 @@ package org.bigbluebutton.modules.phone.managers {
 					netConnection.client = this;
 					netConnection.addEventListener( NetStatusEvent.NET_STATUS , netStatus );
 					netConnection.addEventListener(SecurityErrorEvent.SECURITY_ERROR, securityErrorHandler);
-					netConnection.connect(uri, meetingId, externUserId, username);
+					netConnection.connect(uri, meetingId, userId, username);
 			}
 			if(reconnecting && !amIListenOnly){
 			  handleConnectionSuccess();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
index a9436854d3..6780391642 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
@@ -73,7 +73,7 @@
     private function initConnectionManager():void {
       var options:PhoneOptions = new PhoneOptions();
       var uid:String = String(Math.floor(new Date().getTime()));
-      var uname:String = encodeURIComponent(UsersUtil.getMyExternalUserID() + "-bbbID-" + UsersUtil.getMyUsername()); 
+      var uname:String = encodeURIComponent(UsersUtil.getMyUserID() + "-bbbID-" + UsersUtil.getMyUsername());
       connectionManager.setup(uid, UsersUtil.getMyUserID(), uname , UsersUtil.getInternalMeetingID(), options.uri);
     }