diff --git a/src/common/contacts.py b/src/common/contacts.py
index 2ca0ba08e..eac033c8c 100644
--- a/src/common/contacts.py
+++ b/src/common/contacts.py
@@ -259,8 +259,12 @@ class Contacts:
 		nbr_online = 0
 		nbr_total = 0
 		for account in accounts:
+			our_jid = common.gajim.get_jid_from_account(account)
 			for jid in self.get_jid_list(account):
-				if common.gajim.jid_is_transport(jid):
+				if jid == our_jid:
+					continue
+				if common.gajim.jid_is_transport(jid) and not \
+				common.gajim.config.get('show_transports_group'):
 					# do not count transports
 					continue
 				contact = self.get_contact_with_highest_priority(account, jid)
diff --git a/src/gajim.py b/src/gajim.py
index 635693bc2..ecb4ede30 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -440,6 +440,7 @@ class Interface:
 			if ji in jid_list:
 				# Update existing iter
 				self.roster.draw_contact(ji, account)
+				self.roster.draw_group(_('Transports'), account)
 				# transport just signed in/out, don't show popup notifications
 				# for 30s
 				account_ji = account + '/' + ji