diff --git a/TestXMPP/Main.cs b/TestXMPP/Main.cs
index bc2b36b..21f0ccf 100644
--- a/TestXMPP/Main.cs
+++ b/TestXMPP/Main.cs
@@ -38,7 +38,7 @@ private void Button1Click(object sender, EventArgs e)
 		    Xmpp.Settings.Hostname = fcm_server;
 		    Xmpp.Settings.Port = fcm_dev_port;
 			Xmpp.Settings.Ssl = btnSSL.Checked;
-            ProtocolState.UseIPv6 = false;
+            Xmpp.Settings.UseIPv6 = false;
             ProtocolState.Settings.Ssl = true;
 			_xmpp.Connect();
 		}
@@ -57,7 +57,7 @@ private void BtnSendClick(object sender, EventArgs e)
 
         private void Main_FormClosing(object sender, FormClosingEventArgs e)
         {
-            Serilog.Log.Debug("Disposing xmpp object on form exit");
+            Serilog.Log.Debug("Disconnecting from server");
             if (_xmpp != null && Xmpp.Connected)
                 _xmpp.Disconnect();
         }
diff --git a/ubiety/Infrastructure/XmppSettings.cs b/ubiety/Infrastructure/XmppSettings.cs
index f02bbab..c4e7a07 100644
--- a/ubiety/Infrastructure/XmppSettings.cs
+++ b/ubiety/Infrastructure/XmppSettings.cs
@@ -91,5 +91,10 @@ public int Port
         ///     The disco manager.
         /// </value>
         public IDiscoManager DiscoManager { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool UseIPv6 { get; set; }
     }
 }
\ No newline at end of file
diff --git a/ubiety/Net/Address.cs b/ubiety/Net/Address.cs
index a4a3940..b24a080 100644
--- a/ubiety/Net/Address.cs
+++ b/ubiety/Net/Address.cs
@@ -115,7 +115,7 @@ private IPAddress Resolve(string hostname)
 
             Log.Debug("Trying standard lookup for {0}...", hostname);
 
-            if (Socket.OSSupportsIPv6 && ProtocolState.UseIPv6)
+            if (Socket.OSSupportsIPv6 && ProtocolState.Settings.UseIPv6)
             {
                 Log.Debug("Trying IPv6 resolution...");
                 resp = _resolver.Query(hostname, QType.AAAA, QClass.IN);
diff --git a/ubiety/States/ProtocolState.cs b/ubiety/States/ProtocolState.cs
index 39f0b55..1988cc5 100644
--- a/ubiety/States/ProtocolState.cs
+++ b/ubiety/States/ProtocolState.cs
@@ -114,11 +114,6 @@ private static void EventsOnOnSend(object sender, TagEventArgs tagEventArgs)
         /// </summary>
         public static IRosterManager RosterManager { get; set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public static bool UseIPv6 { get; set; }
-
         /// <summary>
         /// 
         /// </summary>