diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ContactPhotoPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ContactPhotoPanel.java
index d3c634a55..8f95667a3 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ContactPhotoPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ContactPhotoPanel.java
@@ -126,7 +126,8 @@ public void setChatSession(ChatSession chatSession)
         // it sa mutlichat room which
         // cannot be saved with add contact dialog
         if (!chatSession.isDescriptorPersistent()
-            && !(chatSession instanceof ConferenceChatSession))
+            && !(chatSession instanceof ConferenceChatSession)
+            && !ConfigurationManager.isAddContactDisabled())
             this.add(addContactButton, 0);
         else
             this.remove(addContactButton);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
index 904a8c715..60282fc92 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
@@ -867,7 +867,8 @@ private void initButtonsPanel(UIContact uiContact)
             x += desktopSharingButton.getWidth();
         }
 
-        if (uiContact.getDescriptor() instanceof SourceContact)
+        if (uiContact.getDescriptor() instanceof SourceContact
+            && !ConfigurationManager.isAddContactDisabled())
         {
             constraints.anchor = GridBagConstraints.WEST;
             constraints.fill = GridBagConstraints.NONE;