diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 556bafd713..ea074e7e21 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -85,7 +85,9 @@ static char *app = "ChanIsAvail";
 					<para>The canonical channel name that was used to create the channel</para>
 				</variable>
 				<variable name="AVAILSTATUS">
-					<para>The status code for the available channel</para>
+					<para>The status code for the available channel. This is used for both
+					device state and cause code. It is recommended that you use AVAILORIGCHAN
+					instead to see if a device is available or not.</para>
 				</variable>
 			</variablelist>
 		</description>
diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample
index ff679406e4..69370376c1 100644
--- a/configs/extensions.conf.sample
+++ b/configs/extensions.conf.sample
@@ -493,7 +493,7 @@ exten => a,n,Return
 ;   ${ARG1} - Device to page
 
 exten => s,1,ChanIsAvail(${ARG1},s)			; s is for ANY call
-exten => s,n,GoToIf([${AVAILSTATUS} = "1"]?autoanswer:fail)
+exten => s,n,GoToIf([${AVAILORIGCHAN} = ""]?fail:autoanswer)
 exten => s,n(autoanswer),Set(_ALERT_INFO="RA")			; This is for the PolyComs
 exten => s,n,SIPAddHeader(Call-Info: Answer-After=0)	; This is for the Grandstream, Snoms, and Others
 exten => s,n,NoOp()					; Add others here and Post on the Wiki!!!!