diff --git a/admin/general_config.php b/admin/general_config.php
index 6ce41d9..52fed64 100755
--- a/admin/general_config.php
+++ b/admin/general_config.php
@@ -91,6 +91,10 @@ tinymce();
 				require $appUri . $app . '/config.php';
 				if (isset($_CONF['general_conf']) && $_CONF['general_conf'] != '' && file_exists($appUri . $app . '/' . $_CONF['general_conf']))
 				{
+					if(file_exists($appUri . $app . '/lang/') && is_dir($appUri . $app . '/lang/'))
+					{
+						$lang->setLangFolder($appUri . $app . '/lang/');
+					}
 					echo '<i class="divider"></i>';
 					require $appUri . $app . '/' . $_CONF['general_conf'];
 				}
diff --git a/apps/sidebar/genConf.php b/apps/sidebar/genConf.php
index dbd8937..14b4dde 100755
--- a/apps/sidebar/genConf.php
+++ b/apps/sidebar/genConf.php
@@ -29,7 +29,9 @@ else
 	$db->get();
 
 	$active = '';
-	if(!$db->data[0]['active']) $active = ' selected';
+	if(isset($db->data[0])) {
+	    if(!$db->data[0]['active']) $active = ' selected';
+	}
 	?>
 	<p>
 		<input type="checkbox" name="active" value="y" id="activeswitch" onchange="toggleTextField()"/>