diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 61cf9e06d8..6b91cf8aad 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-25  Junichi Satoh <junichi@rworks.jp>
+
+	* util/pandora_db.pl: Fixed error when 'dbengine' token is not defined
+	in pandora_server.conf with enterprise installed.
+
 2014-07-23  Miguel de Dios <miguel.dedios@artica.es>
 	
 	* util/plugin/snmp_remote.pl: some fixed for the snmp v3.
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 3ae1b0cd9c..5b37d77aef 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -547,7 +547,9 @@ sub pandora_load_config ($) {
  	foreach my $param ('dbuser', 'dbpass', 'dbname', 'dbhost', 'log_file') {
 		die ("[ERROR] Bad config values. Make sure " . $conf->{'_pandora_path'} . " is a valid config file.\n\n") unless defined ($conf->{$param});
  	}
+	$conf->{'dbengine'} = 'mysql' unless defined ($conf->{'dbengine'});
 	$conf->{'dbport'} = '3306' unless defined ($conf->{'dbport'});
+	$conf->{'claim_back_snmp_modules'} = '1' unless defined ($conf->{'claim_back_snmp_modules'});
 
 	# Read additional tokens from the DB
 	my $dbh = db_connect ('mysql', $conf->{'dbname'}, $conf->{'dbhost'}, $conf->{'dbport'}, $conf->{'dbuser'}, $conf->{'dbpass'});