diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 57ef4a9e5..871fb457a 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -721,7 +721,7 @@ class mailout_main_ui extends e_admin_ui
 		}
 		else
 		{
-			e107::coreLan('signup');
+		//	e107::coreLan('signup');
 			$tp = e107::getParser();
 
 			$eml = array(
@@ -767,7 +767,7 @@ class mailout_main_ui extends e_admin_ui
 			'LOGINNAME'			=> "test-loginname",
 			'SUBJECT'           => "Test Subject",
 			'DATE_SHORT'        => $tp->toDate(time(),'short'),
-			'DATE_LONG'         => $tp->toDate(time(),'long'),
+			'DATE_LONG'         => $tp->toDate(time(),'long')
 		);
 
 
diff --git a/e107_core/templates/email_template.php b/e107_core/templates/email_template.php
index 2853c8273..62b99c528 100644
--- a/e107_core/templates/email_template.php
+++ b/e107_core/templates/email_template.php
@@ -38,7 +38,7 @@ See e_HANDLER.mail.php for more information
 if (!defined('e107_INIT')) { exit; }
 
 $includeSiteButton = e107::getPref('sitebutton');
-e107::lan('core','signup'); // required for when mailer runs under CLI. 
+e107::lan('core','signup'); // required for when mailer runs under CLI.
 
 /*
 $SIGNUPEMAIL_SUBJECT = LAN_SIGNUP_96.' {SITENAME}';
@@ -142,7 +142,7 @@ $EMAIL_TEMPLATE['default']['footer']		= "<br /><br /><table cellspacing='4'>
  * signup.php?test 
  * signup.php?preview.aftersignup
  */
-
+$EMAIL_TEMPLATE['signup']['name']	 		= 'Signup';
 $EMAIL_TEMPLATE['signup']['subject']		= LAN_SIGNUP_96.' {SITENAME}';
 $EMAIL_TEMPLATE['signup']['header']			= $EMAIL_TEMPLATE['default']['header'];
 $EMAIL_TEMPLATE['signup']['body'] 			= "											
@@ -182,7 +182,7 @@ $EMAIL_TEMPLATE['signup']['footer']			= "</div>
 $EMAIL_TEMPLATE['signup']['cc']				= "";
 $EMAIL_TEMPLATE['signup']['bcc']			= "";
 $EMAIL_TEMPLATE['signup']['attachments']	= "";
-$EMAIL_TEMPLATE['signup']['include']        = "{e_LANGUAGEDIR}{e_LANGUAGE}/lan_signup.php";
+
 
 
 // -----------------------------
diff --git a/e107_plugins/siteinfo/e_shortcode.php b/e107_plugins/siteinfo/e_shortcode.php
index ddd454f20..9ce62f247 100644
--- a/e107_plugins/siteinfo/e_shortcode.php
+++ b/e107_plugins/siteinfo/e_shortcode.php
@@ -35,7 +35,8 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
 
 		if(!empty($path))
 		{
-			return '<a href="'.SITEURL.'" class="sitebutton"><img src="'.$path.'" alt="'.SITENAME.'" /></a>';
+			$siteurl = $this->sc_siteurl();
+			return '<a href="'.$siteurl.'" class="sitebutton"><img src="'.$path.'" alt="'.SITENAME.'" /></a>';
 		}
 	}
 
@@ -50,13 +51,19 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
 	
 	function sc_siteurl($parm='')
 	{
+		if(strlen(deftrue('SITEURL')) < 3 ) //fixes CLI/cron
+		{
+			return e107::getPref('siteurl');
+		}
+
 		return SITEURL;	
 	}
 	
 
 	function sc_sitename($parm='')
 	{
-		return ($parm == 'link') ? "<a href='".SITEURL."' title=\"".SITENAME."\">".SITENAME."</a>" : SITENAME;
+		$url = $this->sc_siteurl();
+		return ($parm == 'link') ? "<a href='".$url."' title='".SITENAME."'>".SITENAME."</a>" : SITENAME;
 	}
 
 	function sc_sitedescription()