diff --git a/e107_core/shortcodes/batch/signup_shortcodes.php b/e107_core/shortcodes/batch/signup_shortcodes.php
index c7eb75921..3e9a1c84d 100755
--- a/e107_core/shortcodes/batch/signup_shortcodes.php
+++ b/e107_core/shortcodes/batch/signup_shortcodes.php
@@ -2,7 +2,7 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2012 e107 Inc (e107.org)
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
@@ -32,8 +32,9 @@ class signup_shortcodes extends e_shortcode
 			return "
 			<form method='post' action='".e_SELF."?stage1' autocomplete='off'>\n
 			<div><br />
-			<input type='radio' name='coppa' value='0' checked='checked' /> ".LAN_NO."
-			<input type='radio' name='coppa' value='1' /> ".LAN_YES."<br />
+			<input type='radio' name='coppa' value='0' id='coppa_no' checked='checked' /> <label class='control-label' for='coppa_no'>".LAN_NO."</label>
+			<input type='radio' name='coppa' value='1' id='coppa_yes' /> <label class='control-label' for='coppa_yes'>".LAN_YES."</label>
+			<br />
 			<br />
 			<input class='btn btn-primary button' type='submit' name='newver' value=\"".LAN_CONTINUE."\" />
 			</div></form>
@@ -88,7 +89,7 @@ class signup_shortcodes extends e_shortcode
 					
 					// 'signup' Creates a new XUP user if not found, otherwise it logs the person in. 
 					
-					$button = (defset('FONTAWESOME') === 4) ? $tp->toGlyph('fa-'.$ic, array('size'=>$size)) : "<img class='e-tip' title='Register using your {$p} account' src='".e_IMAGE_ABS."xup/{$p}.png' alt='' />";			
+					$button = (defset('FONTAWESOME') === 4) ? $tp->toGlyph('fa-'.$ic, array('size'=>$size)) : "<img class='e-tip' title='".$tp->lanVars(LAN_PLUGIN_SOCIAL_XUP_SIGNUP, $p)."' src='".e_IMAGE_ABS."xup/{$p}.png' alt='' />";
 					$text .= " <a title='".$tp->lanVars(LAN_PLUGIN_SOCIAL_XUP_SIGNUP, $p)." ' role='button' class='signup-xup  btn btn-primary' href='".e107::getUrl()->create('system/xup/signup?provider='.$p.'&back='.base64_encode(e_REQUEST_URL))."'>".$button."</a> ";		
 				}
 				//TODO different icon options. see: http://zocial.smcllns.com/
@@ -103,7 +104,8 @@ class signup_shortcodes extends e_shortcode
 	function sc_signup_xup_signup($parm)
 	{
 		$pref = e107::getPref('social_login_active');
-			$tp = e107::getParser();
+		$tp = e107::getParser();
+		
 		if(!empty($pref))
 		{
 			$text = "";
@@ -129,7 +131,7 @@ class signup_shortcodes extends e_shortcode
 						$ic = 'windows';
 					}
 					
-					$button = (defset('FONTAWESOME') === 4) ? "<span title='".$tp->lanVars(LAN_PLUGIN_SOCIAL_XUP_REG, $p)."'>".$tp->toGlyph('fa-'.$ic, array('size'=>$size))."</span>" : "<img class='e-tip' title='Register using your {$p} account' src='".e_IMAGE_ABS."xup/{$p}.png' alt='' />";
+					$button = (defset('FONTAWESOME') === 4) ? "<span title='".$tp->lanVars(LAN_PLUGIN_SOCIAL_XUP_REG, $p)."'>".$tp->toGlyph('fa-'.$ic, array('size'=>$size))."</span>" : "<img class='e-tip' title='".$tp->lanVars(LAN_PLUGIN_SOCIAL_XUP_SIGNUP, $p)."' src='".e_IMAGE_ABS."xup/{$p}.png' alt='' />";
 				
 					$text .= " <a class='signup-xup ".$class."' role='button' href='".e107::getUrl()->create('system/xup/signup?provider='.$p.'&back='.base64_encode(e_REQUEST_URL))."'>".$button."</a> ";		
 				}
@@ -555,8 +557,10 @@ class signup_shortcodes extends e_shortcode
 	// allow main admin to view signup page for design/testing.
 	function sc_signup_adminoptions()
 	{
-
-		if(getperms('0'))
+	
+	$tp = e107::getParser();
+	
+	if(getperms('0'))
 		{
 			$pref = e107::getPref();
 			$frm = e107::getForm();
@@ -564,17 +568,17 @@ class signup_shortcodes extends e_shortcode
 
 			if(intval($pref['user_reg']) !== 1)
 			{
-				$adminMsg .= "<div class='form-group'><b>User registration is currently disabled.</b></div>";
+				$adminMsg .= "<div class='form-group'><b>".LAN_SIGNUP_114."</b></div>";
 			}
 
 			$adminMsg .= "<div class='form-group form-inline'>
-			<a class='btn btn-warning btn-danger btn-sm' href='".e_SELF."?preview'>Preview Activation Email</a>
-			<a class='btn btn-error btn-danger btn-sm' href='".e_SELF."?preview.aftersignup'>Preview After Form Submit</a>
-			<a class='btn btn-error btn-danger btn-sm e-tip' href='".e_SELF."?test' title=\"to ".USEREMAIL."\">Send a Test Activation</a>
+			<a class='btn btn-warning btn-danger btn-sm' href='".e_SELF."?preview'>".LAN_SIGNUP_115."</a>
+			<a class='btn btn-error btn-danger btn-sm' href='".e_SELF."?preview.aftersignup'>".LAN_SIGNUP_116."</a>
+			<a class='btn btn-error btn-danger btn-sm e-tip' href='".e_SELF."?test' title='".$tp->lanVars(LAN_SIGNUP_118, $userEmail )."'>".LAN_SIGNUP_117."</a>
 			</div>
 			";
 
-			$adminMsg .= $frm->checkbox('simulation',1, false, "Don't send email");
+			$adminMsg .= $frm->checkbox('simulation',1, false, LAN_SIGNUP_119);
 
 			return "<div class='alert alert-block alert-error alert-danger text-center'>".$adminMsg."</div>";
 
diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php
index d1a6548c6..ff70b01f3 100644
--- a/e107_languages/English/lan_signup.php
+++ b/e107_languages/English/lan_signup.php
@@ -50,7 +50,7 @@ define("LAN_SIGNUP_13", "You can now log in from the Login box, or from [here]."
 define("LAN_SIGNUP_14", "here");
 define("LAN_SIGNUP_15", "Please contact the main site admin");
 define("LAN_SIGNUP_16", "if you require assistance.");
-define("LAN_SIGNUP_17", "Please certify you are 13 or over the age of 13.");
+define("LAN_SIGNUP_17", "Please certify you are age 13 or over.");
 define("LAN_SIGNUP_18", "Your registration has been received and created with the following login information:");
 //define("LAN_SIGNUP_19", "Username:"); // now LAN_LOGINNAME
 //define("LAN_SIGNUP_20", "Password:"); // now LAN_PASSWORD
@@ -140,7 +140,6 @@ define("LAN_SIGNUP_103", "Too many users already using IP address: ");
 define("LAN_SIGNUP_105", "Unable to action your request - please contact the site administrator");		// Two people with same password.
 define("LAN_SIGNUP_106", "Unable to action your request - do you already have an account here?");		// Trying to set email same as existing
 
-
 define("LAN_LOGINNAME", "Username");
 //define("LAN_PASSWORD", "Password");
 define("LAN_USERNAME", "Display Name");
@@ -154,3 +153,10 @@ define("LAN_SIGNUP_112", "You are currently logged in as Main Admin.");
 
 define("LAN_SIGNUP_113", "Subscription(s)");
 
+define("LAN_SIGNUP_114", "User registration is currently disabled.");
+define("LAN_SIGNUP_115", "Preview Activation Email");
+define("LAN_SIGNUP_116", "Preview After Form Submit");
+define("LAN_SIGNUP_117", "Send a Test Activation");
+define("LAN_SIGNUP_118", "To [x]");
+define("LAN_SIGNUP_119", "Don't send email");
+