diff --git a/fs_add_quest_steps.lua b/fs_add_quest_steps.lua
index f006890..70eb560 100644
--- a/fs_add_quest_steps.lua
+++ b/fs_add_quest_steps.lua
@@ -778,7 +778,7 @@ yl_speak_up.get_fs_add_quest_steps = function(player, param)
 
 	-- some quest steps may not be available/may not make sense
 	local not_available = {}
-	if(current_step and step_data[current_step]) then
+	if(current_step and step_data[current_step] and (not(mode) or mode ~= "assign_quest_step")) then
 		-- steps that are already required
 		for i, s in ipairs(step_data[current_step].one_step_required or {}) do
 			not_available[s] = true
@@ -791,7 +791,7 @@ yl_speak_up.get_fs_add_quest_steps = function(player, param)
 			not_available[s] = true
 		end
 	end
-	if(current_step) then
+	if(current_step and (not(mode) or mode ~= "assign_quest_step")) then
 		not_available[current_step] = true
 	end
 	-- build a list of candidates