diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a1118f5..28ac5bcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.9,2] - 2020-10-22
+
+### Changed
+
+- Only try starting auto attacks on the current target if it's enemy and exists, will prevent "you cannot attack this target" messages and automatic target switching as melee
+
+### Removed
+
+- Removed manual option to start auto attacks
+
 ## [0.9.1] - 2020-10-21
 
 ### Fixed
diff --git a/Clicked.toc b/Clicked.toc
index bae6ca84..05fe506e 100644
--- a/Clicked.toc
+++ b/Clicked.toc
@@ -6,7 +6,7 @@
 #@end-non-retail@
 ## Title: Clicked
 ## Author: Snakybo
-## Version: 0.9.1
+## Version: 0.9.2
 ## Notes: Keybindings made easy.
 ## SavedVariables: ClickedDB
 ## OptionalDeps: Ace3
diff --git a/Config/Bindings.lua b/Config/Bindings.lua
index 5fd68947..61dcedfb 100644
--- a/Config/Bindings.lua
+++ b/Config/Bindings.lua
@@ -817,14 +817,6 @@ local function DrawAdditionalSpellItemOptions(container, action)
 
 		group:AddChild(widget)
 	end
-
-	-- start attack toggle
-	do
-		local widget = GUI:CheckBox(L["BINDING_UI_PAGE_ACTION_ADDITIONAL_OPTIONS_START_AUTO_ATTACK"], action, "startAutoAttack")
-		widget:SetFullWidth(true)
-
-		group:AddChild(widget)
-	end
 end
 
 local function DrawBindingActionPage(container, binding)
diff --git a/Core/BindingProcessor.lua b/Core/BindingProcessor.lua
index 0d9375df..05f939a8 100644
--- a/Core/BindingProcessor.lua
+++ b/Core/BindingProcessor.lua
@@ -355,9 +355,9 @@ local function GetMacroForBindings(bindings)
 				table.insert(extra, "/stopcasting")
 			end
 
-			if not startAutoAttack and data.startAutoAttack then
+			if not startAutoAttack then
 				startAutoAttack = true
-				table.insert(extra, "/startattack")
+				table.insert(extra, "/startattack [@target,harm,exists]")
 			end
 
 			for i = #extra, 1, - 1 do