diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js
index 6861d6eb68..5eba8fc545 100644
--- a/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js
+++ b/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js
@@ -25,6 +25,10 @@ export default function removeUser(meetingId, userId) {
       'user.voiceUser.muted': false,
       'user.time_of_joining': 0,
       'user.listenOnly': false,
+      'user.validated': false,
+      'user.emoji_status': 'none',
+      'user.presenter': false,
+      'user.role': "VIEWER",
     },
   };
 
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/service.js b/bigbluebutton-html5/imports/ui/components/user-list/service.js
index 0af60900bf..0579be38c5 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/service.js
+++ b/bigbluebutton-html5/imports/ui/components/user-list/service.js
@@ -34,7 +34,7 @@ const mapUser = user => ({
   isListenOnly: user.listenOnly,
   isSharingWebcam: user.webcam_stream.length,
   isPhoneUser: user.phone_user,
-  isOnline: true
+  isOnline: user.connection_status === 'online'
 });
 
 const mapOpenChats = chat => {