diff --git a/src/config.cpp b/src/config.cpp
index b72caa862eee6477e2f67030412c3964e606b159..7088889c182bab346ff438ce62b984834e05ce74 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "transport/config.h"
+#include "transport/util.h"
 #include <fstream>
 #ifdef _MSC_VER
 #include <direct.h>
@@ -86,8 +87,12 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
 		("registration.username_label", value<std::string>()->default_value("Legacy network username:"), "Label for username field")
 		("registration.username_mask", value<std::string>()->default_value(""), "Username mask")
 		("registration.encoding", value<std::string>()->default_value("utf8"), "Default encoding in registration form")
+		("registration.require_local_account", value<bool>()->default_value(false), "True if users have to have a local account to register to this transport from remote servers.")
+		("registration.local_username_label", value<std::string>()->default_value("Local username:"), "Label for local usernme field")
+		("registration.local_account_server", value<std::string>()->default_value("localhost"), "The server on which the local accounts will be checked for validity")
+		("registration.local_account_server_timeout", value<int>()->default_value(10000), "Timeout when checking local user on local_account_server (msecs)")
 		("database.type", value<std::string>()->default_value("none"), "Database type.")
-		("database.database", value<std::string>()->default_value(""), "Database used to store data")
+		("database.database", value<std::string>()->default_value("/var/lib/spectrum2/$jid/database.sql"), "Database used to store data")
 		("database.server", value<std::string>()->default_value("localhost"), "Database server.")
 		("database.user", value<std::string>()->default_value(""), "Database user.")
 		("database.password", value<std::string>()->default_value(""), "Database Password.")
@@ -106,6 +111,7 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
 	bool found_working = false;
 	bool found_pidfile = false;
 	bool found_backend_port = false;
+	bool found_database = false;
 	std::string jid = "";
 	BOOST_FOREACH(option &opt, parsed.options) {
 		if (opt.string_key == "service.jid") {
@@ -120,13 +126,7 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
 		else if (opt.string_key == "service.backend_port") {
 			found_backend_port = true;
 			if (opt.value[0] == "0") {
-				unsigned long r = 0;
-				BOOST_FOREACH(char c, _jid) {
-					r += (int) c;
-				}
-				srand(time(NULL) + r);
-				int randomPort = 30000 + rand() % 10000;
-				opt.value[0] = boost::lexical_cast<std::string>(randomPort);
+				opt.value[0] = boost::lexical_cast<std::string>(Util::getRandomPort(_jid.empty() ? jid : _jid));
 			}
 		}
 		else if (opt.string_key == "service.working_dir") {
@@ -135,6 +135,9 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
 		else if (opt.string_key == "service.pidfile") {
 			found_pidfile = true;
 		}
+		else if (opt.string_key == "database.database") {
+			found_database = true;
+		}
 	}
 
 	if (!found_working) {
@@ -148,16 +151,16 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
 		parsed.options.push_back(boost::program_options::basic_option<char>("service.pidfile", value));
 	}
 	if (!found_backend_port) {
-		unsigned long r = 0;
-		BOOST_FOREACH(char c, _jid) {
-			r += (int) c;
-		}
-		srand(time(NULL) + r);
-		int randomPort = 30000 + rand() % 10000;
 		std::vector<std::string> value;
-		value.push_back(boost::lexical_cast<std::string>(randomPort));
+		std::string p = boost::lexical_cast<std::string>(Util::getRandomPort(_jid.empty() ? jid : _jid));
+		value.push_back(p);
 		parsed.options.push_back(boost::program_options::basic_option<char>("service.backend_port", value));
 	}
+	if (!found_database) {
+		std::vector<std::string> value;
+		value.push_back("/var/lib/spectrum2/$jid/database.sql");
+		parsed.options.push_back(boost::program_options::basic_option<char>("database.database", value));
+	}
 
 	BOOST_FOREACH(option &opt, parsed.options) {
 		if (opt.unregistered) {