diff --git a/src/chat_control.py b/src/chat_control.py
index 8a53005d4..03a40c1a4 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1268,12 +1268,11 @@ class ChatControl(ChatControlBase):
 				'status', '', None)
 
 			if self.session:
-				self.session.loggable = gajim.config.get(
-					'log_encrypted_sessions')
+				self.session.loggable = gajim.config.get_per('accounts',
+					self.account, 'log_encrypted_sessions')
 			# GPG is always authenticated as we use GPG's WoT
-			self._show_lock_image(self.gpg_is_active, 'GPG',
-			self.gpg_is_active,
-			self.session and self.session.is_loggable(), True)
+			self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active,
+				self.session and self.session.is_loggable(), True)
 
 		self.status_tooltip = gtk.Tooltips()