diff --git a/GlassVPN/PacketTunnelProvider.swift b/GlassVPN/PacketTunnelProvider.swift
index 0a19055..48f450d 100644
--- a/GlassVPN/PacketTunnelProvider.swift
+++ b/GlassVPN/PacketTunnelProvider.swift
@@ -1,5 +1,6 @@
 import NetworkExtension
 
+let connectMessage: Data = "CONNECT".data(using: .ascii)!
 let swcdUserAgent: Data = "User-Agent: swcd".data(using: .ascii)!
 fileprivate var hook : GlassVPNHook!
 
@@ -25,7 +26,9 @@ class LDObserverFactory: ObserverFactory {
 				let kill = hook.processDNSRequest(session.host)
 				if kill { socket.forceDisconnect() }
 			case .readData(let data, on: let socket):
-				if hook.forceDisconnectSWCD, data.range(of: swcdUserAgent) != nil {
+				if hook.forceDisconnectSWCD,
+					data.starts(with: connectMessage),
+					data.range(of: swcdUserAgent) != nil {
 					socket.disconnect()
 				}
 			default:
diff --git a/main/Common Classes/PrefsShared.swift b/main/Common Classes/PrefsShared.swift
index 5350a88..7b7d7a8 100644
--- a/main/Common Classes/PrefsShared.swift	
+++ b/main/Common Classes/PrefsShared.swift	
@@ -12,6 +12,7 @@ enum PrefsShared {
 	
 	static func registerDefaults() {
 		suite.register(defaults: [
+			"ForceDisconnectSWCD" : true,
 			"RestartReminderEnabled" : true,
 			"RestartReminderWithText" : true,
 			"RestartReminderWithBadge" : true,
diff --git a/main/GUI/Base.lproj/Settings.storyboard b/main/GUI/Base.lproj/Settings.storyboard
index 49a2dc4..d0c8a87 100644
--- a/main/GUI/Base.lproj/Settings.storyboard
+++ b/main/GUI/Base.lproj/Settings.storyboard
@@ -291,8 +291,8 @@
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="User-Agent: swcd (may affect performance)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="n7p-Ab-69G">
-                                                    <rect key="frame" x="16" y="25.5" width="249.5" height="14.5"/>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="background deamon User-Agent: swcd" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="n7p-Ab-69G">
+                                                    <rect key="frame" x="16" y="25.5" width="220.5" height="14.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
@@ -434,7 +434,7 @@ If App Badge is enabled, display the letter "1" on the homescreen app icon, as l
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="zaV-mh-eqb">
-                                                    <rect key="frame" x="251" y="6" width="54" height="31"/>
+                                                    <rect key="frame" x="250" y="6" width="54" height="31"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <connections>
                                                         <action selector="toggleAllowRestartReminder:" destination="JYM-cs-i4H" eventType="valueChanged" id="F4e-k2-bni"/>
@@ -461,7 +461,7 @@ If App Badge is enabled, display the letter "1" on the homescreen app icon, as l
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="HaE-En-NH3">
-                                                    <rect key="frame" x="251" y="6" width="54" height="31"/>
+                                                    <rect key="frame" x="250" y="6" width="54" height="31"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <connections>
                                                         <action selector="toggleAllowRestartNotify:" destination="JYM-cs-i4H" eventType="valueChanged" id="12C-h5-mrR"/>
@@ -488,7 +488,7 @@ If App Badge is enabled, display the letter "1" on the homescreen app icon, as l
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="N2Q-cU-pkd">
-                                                    <rect key="frame" x="251" y="6" width="54" height="31"/>
+                                                    <rect key="frame" x="250" y="6" width="54" height="31"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <connections>
                                                         <action selector="toggleAllowRestartBadge:" destination="JYM-cs-i4H" eventType="valueChanged" id="76l-6y-fOu"/>