diff --git a/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml b/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
index 3d9263e364..b87bbb6352 100644
--- a/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
@@ -1,12 +1,14 @@
 <context name="{v_context}">
 	<extension name="agent_status" number="*22" continue="false" app_uuid="2eb032c5-c79d-4096-ac90-8a47fe40f411" order="200">
 		<condition field="destination_number" expression="^\*22$" break="on-true">
-			<action application="set" data="agent_id=${sip_from_user}"/>
-			<action application="lua" data="app.lua agent_status"/>
+			<action application="set" data="agent_id=${sip_from_user}" enabled="true"/>
+			<action application="set" data="agent_authorized=true" enabled="false"/>
+			<action application="lua" data="app.lua agent_status" enabled="true"/>
 		</condition>
 		<condition field="destination_number" expression="^(?:agent\+|\*22)(.+)$">
-			<action application="set" data="agent_id=$1"/>
-			<action application="lua" data="app.lua agent_status"/>
+			<action application="set" data="agent_id=$1" enabled="true"/>
+			<action application="set" data="agent_authorized=true" enabled="false"/>
+			<action application="lua" data="app.lua agent_status" enabled="true"/>
 		</condition>
 	</extension>
 </context>