diff --git a/indra/newview/hbprefsinert.cpp b/indra/newview/hbprefsinert.cpp
index 9dbd3032a..d7376ea7c 100644
--- a/indra/newview/hbprefsinert.cpp
+++ b/indra/newview/hbprefsinert.cpp
@@ -39,6 +39,7 @@
 #include "lluictrlfactory.h"
 #include "llcombobox.h"
 #include "llwind.h"
+#include "llviewernetwork.h"
 #include "pipeline.h"
 
 class LLPrefsInertImpl : public LLPanel
@@ -270,8 +271,13 @@ void LLPrefsInertImpl::apply()
 		if(new_spoof_protection != mSpoofProtectionAtOpen)
 		{
 			mSpoofProtectionAtOpen = new_spoof_protection;
+
 			gMessageSystem->stopSpoofProtection();
-			gMessageSystem->startSpoofProtection(new_spoof_protection);
+
+			if(LLViewerLogin::getInstance()->getGridChoice() < GRID_INFO_LOCAL)
+				gMessageSystem->startSpoofProtection(new_spoof_protection);
+			else
+				gMessageSystem->startSpoofProtection(0);
 		}
 	}
 	refreshValues();
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index d9d0cdd84..5b370e99b 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -80,6 +80,7 @@
 // <edit>
 #include "llappviewer.h"
 #include "llspinctrl.h"
+#include "llviewermessage.h"
 #include <boost/lexical_cast.hpp>
 // </edit>
 #define USE_VIEWER_AUTH 0
@@ -1233,7 +1234,19 @@ void LLPanelLogin::onClickConnect(void *)
 {
 	if (sInstance && sInstance->mCallback)
 	{
-		// <edit> save identity settings for login
+		// <edit>
+		if(gMessageSystem)
+		{
+			//IP spoofing protection only really works on the LL's grids
+			if(LLViewerLogin::getInstance()->getGridChoice() < GRID_INFO_LOCAL)
+				gMessageSystem->startSpoofProtection(gSavedSettings.getU32("SpoofProtectionLevel"));
+			else
+				gMessageSystem->startSpoofProtection(0);
+
+			gMessageSystem->setSpoofDroppedCallback(spoof_dropped_callback);
+		}
+
+		// save identity settings for login
 		bool specify_mac = sInstance->getChild<LLCheckBoxCtrl>("mac_check")->getValue();
 		bool specify_id0 = sInstance->getChild<LLCheckBoxCtrl>("id0_check")->getValue();
 		
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 30c70527c..bb0b24391 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -927,14 +927,6 @@ bool idle_startup()
 				LLAppViewer::instance()->earlyExit("LoginFailedNoNetwork", LLSD().insert("DIAGNOSTIC", diagnostic));
 			}
 
-			// <edit>
-			if(gMessageSystem)
-			{
-				gMessageSystem->startSpoofProtection(gSavedSettings.getU32("SpoofProtectionLevel"));
-				gMessageSystem->setSpoofDroppedCallback(spoof_dropped_callback);
-			}
-			// </edit>
-
 			#if LL_WINDOWS
 				// On the windows dev builds, unpackaged, the message.xml file will 
 				// be located in indra/build-vc**/newview/<config>/app_settings.
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
index 2fd3c7be1..8afd1afdb 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
@@ -102,9 +102,10 @@
 			     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 			     mouse_opaque="false" name="text_box" v_pad="0" width="500">
-				IP Spoofing Protection (0 being off, 3 being highest, anything higher than 1 may BlueScreen Windows)
+				IP Spoofing Protection (0 being off, 3 being highest,
+anything higher than 1 may bluescreen Windows in tcpip.sys)
 			</text>
-			 <slider bottom_delta="-25" can_edit_text="false"
+			 <slider bottom_delta="-37" can_edit_text="false"
 			     decimal_digits="0" enabled="true" follows="left|top" height="15"
 			     increment="1" initial_val="0" left_delta="0" max_val="3" min_val="0"
 			     mouse_opaque="true" control_name="SpoofProtectionLevel" name="ip_spoof_slider" show_text="true"