diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index b29eab3d05..1f4473f9df 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -89,11 +89,23 @@ SWITCH_STANDARD_API(user_data_function)
 
 				if (var && val && !strcasecmp(var, key)) {
 					stream->write_function(stream, "%s", val);
-					break;
+					goto end;
 				}
 
 			}
 		}
+		
+		if ((x_params = switch_xml_child(x_domain, container))) {
+			for (x_param = switch_xml_child(x_params, elem); x_param; x_param = x_param->next) {
+				const char *var = switch_xml_attr(x_param, "name");
+				const char *val = switch_xml_attr(x_param, "value");
+
+				if (var && val && !strcasecmp(var, key)) {
+					stream->write_function(stream, "%s", val);
+					goto end;
+				}
+			}
+		}
 	}
 
   end: