diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 42291d5ed..76b99a150 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -253,14 +253,15 @@ class admin_shortcodes
 			$select .= "
 			<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."'>
 			<div>
-			<select name='sitelanguage' id='sitelanguage' class='tbox'>";
+			<select name='sitelanguage' id='sitelanguage' class='tbox' onchange='this.form.submit()'>";
 			foreach($lanperms as $lng)
 			{
 				$langval = ($lng == $pref['sitelanguage'] && $lng == 'English') ? "" : $lng;
 				$selected = ($lng == $sql->mySQLlanguage || ($lng == $pref['sitelanguage'] && !$sql->mySQLlanguage)) ? " selected='selected'" : "";
 				$select .= "<option value='".$langval."'{$selected}>$lng</option>\n";
 			}
-			$select .= "</select> ".(!isset($params['nobutton']) ? "<button class='update' type='submit' name='setlanguage' value='no-value'><span>".UTHEME_MENU_L1."</span></button>" : '')."
+			$select .= "</select> ".(!isset($params['nobutton']) ? "<button class='update e-hide-if-js' type='submit' name='setlanguage' value='no-value'><span>".UTHEME_MENU_L1."</span></button>" : '')."
+			".e107::getForm()->hidden('setlanguage', '1')."
 			</div>
 			</form>
 			";