diff --git a/src/engine/client/library/clientGame/src/shared/object/PlayerObject.cpp b/src/engine/client/library/clientGame/src/shared/object/PlayerObject.cpp
index cb1b67387..a815f43c5 100644
--- a/src/engine/client/library/clientGame/src/shared/object/PlayerObject.cpp
+++ b/src/engine/client/library/clientGame/src/shared/object/PlayerObject.cpp
@@ -54,9 +54,7 @@
 #include "swgSharedUtility/JediConstants.h"
 
 
-#if PRODUCTION == 0
 bool PlayerObject::s_admin = false;
-#endif
 
 namespace PlayerObjectNamespace
 {
@@ -2071,11 +2069,7 @@ void PlayerObject::getObjectInfo(std::map<std::string, std::map<std::string, Uni
 
 void PlayerObject::setAdmin(bool admin)
 {
-#if PRODUCTION == 0
 	s_admin = admin;
-#else
-	UNREF(admin);
-#endif
 }
 
 //----------------------------------------------------------------------
diff --git a/src/engine/client/library/clientGame/src/shared/object/PlayerObject.h b/src/engine/client/library/clientGame/src/shared/object/PlayerObject.h
index 746d10c1f..8d8d3425d 100644
--- a/src/engine/client/library/clientGame/src/shared/object/PlayerObject.h
+++ b/src/engine/client/library/clientGame/src/shared/object/PlayerObject.h
@@ -414,9 +414,7 @@ private:
 
 private:
 	
-#if PRODUCTION == 0
 	static bool s_admin;
-#endif
 
 	void shouldShowBackpack(bool show);
 	void shouldShowHelmet(bool show);
@@ -933,11 +931,7 @@ inline std::string const & PlayerObject::getDefaultAttackOverride() const
 
 inline bool PlayerObject::isAdmin()
 {
-#if PRODUCTION == 0
 	return s_admin;
-#else
-	return false;
-#endif
 }
 
 // ----------------------------------------------------------------------
diff --git a/src/engine/client/library/clientUserInterface/src/shared/core/CuiPreferences.cpp b/src/engine/client/library/clientUserInterface/src/shared/core/CuiPreferences.cpp
index 4187abafc..0a191d392 100644
--- a/src/engine/client/library/clientUserInterface/src/shared/core/CuiPreferences.cpp
+++ b/src/engine/client/library/clientUserInterface/src/shared/core/CuiPreferences.cpp
@@ -1742,7 +1742,7 @@ bool   CuiPreferences::getDragOntoContainers ()
 
 bool   CuiPreferences::getAllowTargetAnything ()
 {
-	return ms_allowTargetAnything;
+	return ms_allowTargetAnything && PlayerObject::isAdmin();
 }
 
 //----------------------------------------------------------------------
diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHud.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHud.cpp
index bb99dc8f3..777b8e025 100644
--- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHud.cpp
+++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHud.cpp
@@ -198,11 +198,9 @@ namespace SwgCuiHudNamespace
 
 		const ClientObject * const clientObject = obj ? obj->asClientObject () : 0;
 
-#if PRODUCTION == 0
 		const bool allowTargetAnything = CuiPreferences::getAllowTargetAnything ();
 		//-- don't target buildings and shit
 		if (!allowTargetAnything)
-#endif
 		{
 			//-- we are looking at an untargettable object
 			if (!clientObject)