diff --git a/block/misc/BlockSecurity.java b/block/misc/BlockSecurity.java
index 034daf123..0f70aa566 100644
--- a/block/misc/BlockSecurity.java
+++ b/block/misc/BlockSecurity.java
@@ -10,6 +10,7 @@ import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.blocks.RendererSecurity;
 import appeng.core.features.AEFeature;
+import appeng.core.localization.PlayerMessages;
 import appeng.core.sync.GuiBridge;
 import appeng.tile.misc.TileSecurity;
 import appeng.util.Platform;
@@ -39,8 +40,16 @@ public class BlockSecurity extends AEBaseBlock
 		if ( tg != null )
 		{
 			if ( Platform.isServer() )
-				Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SECURITY );
+			{
+				if ( tg.isPowered() )
+				{
+					Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SECURITY );
+				}
+				else
+					p.sendChatToPlayer( PlayerMessages.MachineNotPowered.get() );
+			}
 			return true;
+
 		}
 		return false;
 	}
diff --git a/client/me/ItemRepo.java b/client/me/ItemRepo.java
index bf5034636..ace3b6a40 100644
--- a/client/me/ItemRepo.java
+++ b/client/me/ItemRepo.java
@@ -132,8 +132,8 @@ public class ItemRepo
 
 		if ( SortBy == SortOrder.AMOUNT )
 			Collections.sort( view, ItemSorters.ConfigBased_SortBySize );
-		else if ( SortBy == SortOrder.MOD )
-			Collections.sort( view, ItemSorters.ConfigBased_SortByMod );
+		// else if ( SortBy == SortOrder.MOD )
+		// Collections.sort( view, ItemSorters.ConfigBased_SortByMod );
 		else
 			Collections.sort( view, ItemSorters.ConfigBased_SortByName );
 
diff --git a/me/storage/SecurityInventory.java b/me/storage/SecurityInventory.java
index ea34e1f87..f3d907ea3 100644
--- a/me/storage/SecurityInventory.java
+++ b/me/storage/SecurityInventory.java
@@ -115,6 +115,10 @@ public class SecurityInventory implements IMEInventoryHandler<IAEItemStack>
 			IBiometricCard tbc = (IBiometricCard) input.getItem();
 			String newUser = tbc.getUsername( input.getItemStack() );
 
+			int PlayerID = AEApi.instance().registries().players().getID( newUser );
+			if ( securityTile.getOwner() == PlayerID )
+				return false;
+
 			for (IAEItemStack ais : storedItems)
 			{
 				if ( ais.isMeaninful() )
diff --git a/tile/misc/TileSecurity.java b/tile/misc/TileSecurity.java
index 5704a846c..63b189065 100644
--- a/tile/misc/TileSecurity.java
+++ b/tile/misc/TileSecurity.java
@@ -270,4 +270,9 @@ public class TileSecurity extends AENetworkTile implements IStorageMonitorable,
 		return securityKey;
 	}
 
+	public boolean isPowered()
+	{
+		return gridProxy.isActive();
+	}
+
 }