diff --git a/e107_plugins/download/admin_download.php b/e107_plugins/download/admin_download.php
index ff163a15a..e792287a2 100644
--- a/e107_plugins/download/admin_download.php
+++ b/e107_plugins/download/admin_download.php
@@ -44,14 +44,10 @@ require_once(e_HANDLER."userclass_class.php");
 require_once(e_HANDLER."file_class.php");
 
 $fl = new e_file;
-
+$pref = e107::getPref(); // legacy, remove all globals
 $download = new download();
 // $adminDownload = new adminDownload();
 
-new plugin_download_admin();
-require_once(e_ADMIN."auth.php");
-
-
 
 /*
 
@@ -189,12 +185,16 @@ if (isset($_POST['addlimit']))
 
 if (isset($_POST['updatelimits']))
 {
-
-	if ($pref['download_limits'] != $_POST['download_limits'])
+	
+	//if ($pref['download_limits'] != $_POST['download_limits'])
 	{
-		$pref['download_limits'] = ($_POST['download_limits'] == 'on') ? 1 : 0;
-		save_prefs();
-		$message .= DOWLAN_126."<br/>";
+		$tmp = ($_POST['download_limits'] == 'on') ? 1 : 0;
+		if ($pref['download_limits'] != $tmp)
+		{
+			$pref['download_limits'] = $tmp;
+			e107::getConfig()->set('download_limits', $tmp)->save(false);
+			$message .= DOWLAN_126."<br/>";
+		}
 	}
 	foreach(array_keys($_POST['count_num']) as $idLim)
 	{
@@ -228,7 +228,8 @@ if (isset($_POST['updatelimits']))
 	}
 }
 
-
+new plugin_download_admin();
+require_once(e_ADMIN."auth.php");
 //download/includes/admin.php is auto-loaded. 
  e107::getAdminUI()->runPage();
 require_once(e_ADMIN."footer.php");
diff --git a/e107_plugins/download/includes/admin.php b/e107_plugins/download/includes/admin.php
index 25889f879..68f62523d 100644
--- a/e107_plugins/download/includes/admin.php
+++ b/e107_plugins/download/includes/admin.php
@@ -496,8 +496,9 @@ $columnInfo = array(
 			$sql = e107::getDb();
 			$ns = e107::getRender();
 			$tp = e107::getParser();
+			$pref = e107::getPref();
 			
-			global $pref;
+			//global $pref;
 			
 			if ($sql->db_Select('userclass_classes','userclass_id, userclass_name'))
 			{
@@ -518,7 +519,7 @@ $columnInfo = array(
 				";
 				if(vartrue($pref['download_limits']) == 1)
 				{
-					$chk = "checked = 'checked'";
+					$chk = " checked = 'checked'";
 				}
 				else
 				{
@@ -526,7 +527,7 @@ $columnInfo = array(
 				}
 		
 				$txt .= "
-					<input type='checkbox' name='download_limits' {$chk}/> ".DOWLAN_125."
+					<input type='checkbox' name='download_limits' value='on'{$chk}/> ".DOWLAN_125."
 					</td>
 				</tr>
 				<tr>