diff --git a/app/controllers/pbw/commands_controller.rb b/app/controllers/pbw/commands_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/pbw/commands_controller.rb
+++ b/app/controllers/pbw/commands_controller.rb
@@ -7,5 +7,10 @@ module Pbw
 		def update_model_before_create(model)
 			model.user = current_user
 		end
+
+		def index_scope
+			scope = super
+			scope.where(user: current_user)
+		end
 	end
 end
\ No newline at end of file
diff --git a/app/controllers/pbw/tokens_controller.rb b/app/controllers/pbw/tokens_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/pbw/tokens_controller.rb
+++ b/app/controllers/pbw/tokens_controller.rb
@@ -7,5 +7,10 @@ module Pbw
 		def update_model_before_create(model)
 			model.user = current_user
 		end
+
+		def index_scope
+			scope = super
+			scope.where(user: current_user)
+		end
 	end
 end
\ No newline at end of file
Filter tokens and commands by current user