diff --git a/src/common/config.py b/src/common/config.py
index adb3c701d..afe3cca47 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -279,6 +279,7 @@ class Config:
 		'video_output_device': [opt_str, 'autovideosink'],
 		'use_stun_server': [opt_bool, True, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')],
 		'stun_server': [opt_str, '', _('STUN server to use when using jingle')],
+		'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')],
 	}
 
 	__options_per_key = {
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 1002cc1f9..2b512bab3 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -1136,7 +1136,8 @@ class GroupchatControl(ChatControlBase):
 				         '%s</span>') % (colorstring, gobject.markup_escape_text(status))
 
 		if image.get_storage_type() == gtk.IMAGE_PIXBUF and \
-		gc_contact.affiliation != 'none':
+		gc_contact.affiliation != 'none' and gajim.config.get(
+		'show_affiliation_in_groupchat'):
 			pixbuf1 = image.get_pixbuf().copy()
 			pixbuf2 = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 4, 4)
 			if gc_contact.affiliation == 'owner':