diff --git a/src/main/java/dan200/computercraft/ComputerCraft.java b/src/main/java/dan200/computercraft/ComputerCraft.java
index 29dfa7f6c..756ad66c7 100644
--- a/src/main/java/dan200/computercraft/ComputerCraft.java
+++ b/src/main/java/dan200/computercraft/ComputerCraft.java
@@ -386,16 +386,6 @@ private static File getResourcePackDir()
         return new File( getBaseDir(), "resourcepacks" );
     }
 
-    public static boolean canPlayerUseCommands( EntityPlayer player )
-    {
-        MinecraftServer server = player.getServer();
-        if( server != null )
-        {
-            return server.getPlayerList().canSendCommands( player.getGameProfile() );
-        }
-        return false;
-    }
-
     @Deprecated
     public static void registerPermissionProvider( ITurtlePermissionProvider provider )
     {
@@ -730,5 +720,12 @@ public static IPeripheral getPeripheralAt( World world, BlockPos pos, EnumFacing
     {
         return Peripherals.getPeripheral( world, pos, side );
     }
+
+    @Deprecated
+    public static boolean canPlayerUseCommands( EntityPlayer player )
+    {
+        MinecraftServer server = player.getServer();
+        return server != null && server.getPlayerList().canSendCommands( player.getGameProfile() );
+    }
     //endregion
 }
diff --git a/src/main/java/dan200/computercraft/shared/command/ContainerViewComputer.java b/src/main/java/dan200/computercraft/shared/command/ContainerViewComputer.java
index 1b44789f5..a42673b0e 100644
--- a/src/main/java/dan200/computercraft/shared/command/ContainerViewComputer.java
+++ b/src/main/java/dan200/computercraft/shared/command/ContainerViewComputer.java
@@ -57,7 +57,7 @@ public boolean canInteractWith( @Nonnull EntityPlayer player )
                     player.sendMessage( new TextComponentTranslation( "advMode.notEnabled" ) );
                     return false;
                 }
-                else if( !ComputerCraft.canPlayerUseCommands( player ) || !player.capabilities.isCreativeMode )
+                else if( !player.canUseCommandBlock() )
                 {
                     player.sendMessage( new TextComponentTranslation( "advMode.notAllowed" ) );
                     return false;
diff --git a/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java b/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java
index d133c37c3..d02b657a0 100644
--- a/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java
+++ b/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java
@@ -176,14 +176,14 @@ public boolean isUsable( EntityPlayer player, boolean ignoreRange )
             player.sendMessage( new TextComponentTranslation( "advMode.notEnabled" ) );
             return false;
         }
-        else if( ComputerCraft.canPlayerUseCommands( player ) && player.capabilities.isCreativeMode )
-        {
-            return super.isUsable( player, ignoreRange );
-        }
-        else
+        else if( !player.canUseCommandBlock() )
         {
             player.sendMessage( new TextComponentTranslation( "advMode.notAllowed" ) );
             return false;
         }
+        else
+        {
+            return super.isUsable( player, ignoreRange );
+        }
     }
 }