diff --git a/e107_plugins/download/download_shortcodes.php b/e107_plugins/download/download_shortcodes.php
index 480944394..4eabb60a0 100644
--- a/e107_plugins/download/download_shortcodes.php
+++ b/e107_plugins/download/download_shortcodes.php
@@ -378,7 +378,7 @@ class download_shortcodes extends e_shortcode
      	}
      	else
      	{
-     		$url = $this->sc_download_request_url();
+     		$url = $tp->parseTemplate("{DOWNLOAD_REQUEST_URL}",true, $this); // $this->sc_download_request_url();
      	  	return ($pref['agree_flag'] ? "<a class='e-tip' title='".LAN_DOWNLOAD."' href='".$url."' onclick= \"return confirm('{$agreetext}');\">{$img}</a>" : "<a class='e-tip' title='".LAN_DOWNLOAD."' href='".$url."' >{$img}</a>");
    
 		//	return ($pref['agree_flag'] ? "<a class='e-tip' title='".LAN_DOWNLOAD."' href='".e_PLUGIN_ABS."download/request.php?".$this->var['download_id']."' onclick= \"return confirm('{$agreetext}');\">{$img}</a>" : "<a class='e-tip' title='".LAN_DOWNLOAD."' href='".e_PLUGIN_ABS."download/request.php?".$this->var['download_id']."' >{$img}</a>");
@@ -492,7 +492,7 @@ class download_shortcodes extends e_shortcode
 		$tp = e107::getParser();
 
 		$viewUrl = e107::getUrl()->create('download/view/item',array('id'=>$this->var['download_id'], 'name'=>$this->var['download_sef']));	
-		$requestUrl = $this->sc_download_request_url();
+		$requestUrl = 	$url = $tp->parseTemplate("{DOWNLOAD_REQUEST_URL}",true,$this); // $this->sc_download_request_url();
 
 		$link['view'] = "<a href='".$viewUrl."'>".$this->var['download_name']."</a>";
 		$link['request'] = "<a href='".$requestUrl."' title='".LAN_dl_46."'>".$this->var['download_name']."</a>";
@@ -514,7 +514,7 @@ class download_shortcodes extends e_shortcode
       global $dl;
 	  $tp = e107::getParser();
 	  $pref = e107::getPref();
-	  $url = $this->sc_download_request_url();
+	  $url = 	$url = $tp->parseTemplate("{DOWNLOAD_REQUEST_URL}",true,$this);  //$this->sc_download_request_url();
 	  
       if ($pref['agree_flag'] == 1) 
       {
@@ -649,7 +649,7 @@ class download_shortcodes extends e_shortcode
       		$click = " onclick='return confirm(\"".$tp->toJS($tp->toHTML($pref['agree_text'],true,'emotes, no_tags'))."\")'";
 		}
 		
-		$url = $this->sc_download_request_url();
+		$url = 	$url = $tp->parseTemplate("{DOWNLOAD_REQUEST_URL}",true,$this); //$this->sc_download_request_url();
      	
      	if(varset($parm['type']) == 'href')
 		{