diff --git a/data/glade/preferences_window.glade b/data/glade/preferences_window.glade
index db6d98b45..75a1a1a22 100644
--- a/data/glade/preferences_window.glade
+++ b/data/glade/preferences_window.glade
@@ -2158,6 +2158,7 @@ $T will be replaced by auto-not-available timeout</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">&#x25CF;</property>
+                                <signal name="changed" handler="stun_server_entry_changed"/>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>
diff --git a/src/common/jingle_rtp.py b/src/common/jingle_rtp.py
index 0b8d846f2..6d30f2da5 100644
--- a/src/common/jingle_rtp.py
+++ b/src/common/jingle_rtp.py
@@ -16,6 +16,7 @@ Handles Jingle RTP sessions (XEP 0167)
 """
 
 import gobject
+import socket
 
 import xmpp
 import farsight, gst
@@ -71,7 +72,7 @@ class JingleRTPContent(JingleContent):
 		# pidgin and telepathy-gabble don't follow the XEP, and it won't work
 		# due to bad controlling-mode
 		params = {'controlling-mode': self.session.weinitiate, 'debug': False}
-		stun_server = gajim.config.get('stun-server')
+		stun_server = gajim.config.get('stun_server')
 		if stun_server:
 			try:
 				ip = socket.getaddrinfo(stun_server, 0, socket.AF_UNSPEC,