diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 59e296946..8b70ed0fa 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -857,7 +857,10 @@ class GroupchatControl(ChatControlBase):
 				print_status = gajim.config.get('print_status_in_muc')
 			nick_jid = nick
 			if jid:
-				nick_jid += ' (%s)' % jid
+				# delete ressource
+				jid_splitted = jid.split('/')
+				simple_jid = jid_splitted[0]
+				nick_jid += ' (%s)' % simple_jid
 			if show == 'offline' and print_status in ('all', 'in_and_out'):
 				st = _('%s has left') % nick_jid
 				if reason:
diff --git a/src/roster_window.py b/src/roster_window.py
index a37815d9c..5cf24554e 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1093,8 +1093,12 @@ class RosterWindow:
 				win.redraw_tab(ctrl)
 
 				name = contact.get_shown_name()
-				if contact.resource != '':
+
+				# if multiple resources (or second one disconnecting)
+				if (len(contact_instances) > 1 or (len(contact_instances) == 1 and \
+					show in ('offline', 'error'))) and contact.resource != '':
 					name += '/' + contact.resource
+				
 				uf_show = helpers.get_uf_show(show)
 				if status: 
 					ctrl.print_conversation(_('%s is now %s (%s)') % (name, uf_show,