--- apps/app_setcallerid.c.orig	2008-04-18 13:40:20.000000000 +1000
+++ apps/app_setcallerid.c	2008-04-18 13:51:40.000000000 +1000
@@ -70,8 +70,9 @@
 	int pres = -1;
 
 	u = ast_module_user_add(chan);
-	
-	pres = ast_parse_caller_presentation(data);
+
+	if ((pres = (int)strtol(data, (char **)NULL, 10)) == 0)
+		pres = ast_parse_caller_presentation(data);
 
 	if (pres < 0) {
 		ast_log(LOG_WARNING, "'%s' is not a valid presentation (see 'show application SetCallerPres')\n",