diff --git a/src/common/config.py b/src/common/config.py
index 682366f38..fe8940acd 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -115,6 +115,7 @@ class Config:
 			'keyid': [ opt_str, '' ],
 			'keyname': [ opt_str, '' ],
 			'usetls': [ opt_bool, False ],
+			'force_nonSASL': [ opt_bool, False ],
 			'savegpgpass': [ opt_bool, False ],
 			'gpgpassword': [ opt_str, '' ],
 			'sync_with_global_status': [ opt_bool, True ],
diff --git a/src/common/connection.py b/src/common/connection.py
index 06e893e60..75ab673bd 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -565,7 +565,8 @@ class Connection:
 		gajim.log.debug('Connected to server')
 
 		try:
-			auth = con.auth(name, self.password, resource) #FIXME: blocking
+			auth = con.auth(name, self.password, resource,
+				not gajim.config.get_per('accounts', self.name, 'force_nonSASL')) #FIXME: blocking
 		except IOError: #probably a timeout
 			self.connected = 0
 			self.dispatch('STATUS', 'offline')