diff --git a/spectrum_manager/src/main.cpp b/spectrum_manager/src/main.cpp
index ac816e20543e1eeb900f293203749bf8f5b02669..233f55b3818e601188788fbc6c9424da7d648c8f 100644
--- a/spectrum_manager/src/main.cpp
+++ b/spectrum_manager/src/main.cpp
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
 	}
 	else if (command[0] == "server") {
 		Server server(&config);
-		server.start(8080);
+		server.start();
 		while (1) { sleep(10); }
 	}
 	else {
diff --git a/spectrum_manager/src/managerconfig.cpp b/spectrum_manager/src/managerconfig.cpp
index 807bab8b77ed2b980a5ef0926f3bbbc3a597feb0..b3c159c4d0c1ed40373e353ce4ec81987271eadf 100644
--- a/spectrum_manager/src/managerconfig.cpp
+++ b/spectrum_manager/src/managerconfig.cpp
@@ -31,6 +31,7 @@ bool ManagerConfig::load(const std::string &configfile, boost::program_options::
 	opts.add_options()
 		("service.admin_username", value<std::string>()->default_value(""), "Administrator username.")
 		("service.admin_password", value<std::string>()->default_value(""), "Administrator password.")
+		("service.port", value<int>()->default_value(8081), "Web interface port.")
 		("service.config_directory", value<std::string>()->default_value("/etc/spectrum2/transports/"), "Directory with spectrum2 configuration files. One .cfg file per one instance")
 		("servers.server", value<std::vector<std::string> >()->multitoken(), "Server.")
 	;
diff --git a/spectrum_manager/src/server.cpp b/spectrum_manager/src/server.cpp
index 0bde682bedf39b15c0cbdc6d3450b0566d09e500..cc86e9277cbb21977dfd0d91c4e0f5bf96d8e756 100644
--- a/spectrum_manager/src/server.cpp
+++ b/spectrum_manager/src/server.cpp
@@ -158,9 +158,9 @@ static void *_event_handler(enum mg_event event, struct mg_connection *conn) {
 	return static_cast<Server *>(request_info->user_data)->event_handler(event, conn);
 }
 
-bool Server::start(int port) {
+bool Server::start() {
 	const char *options[] = {
-		"listening_ports", boost::lexical_cast<std::string>(port).c_str(),
+		"listening_ports", boost::lexical_cast<std::string>(CONFIG_INT(m_config, "service.port")).c_str(),
 		"num_threads", "1",
 		NULL
 	};
@@ -296,7 +296,7 @@ void Server::serve_login(struct mg_connection *conn, const struct mg_request_inf
       <br/>\
       <form action=\"/authorize\">\
         Username: <input type=\"text\" name=\"user\"></input><br/>\
-        Password: <input type=\"text\" name=\"password\"></input><br/>\
+        Password: <input type=\"password\" name=\"password\"></input><br/>\
         <input type=\"submit\" value=\"Login\"></input>\
       </form>\
     </center>\
diff --git a/spectrum_manager/src/server.h b/spectrum_manager/src/server.h
index 94c42da5ed5eecf2745ec8b12f69134ecd1e7557..4d20204029c5d25631c37ead63fec2d1180530bf 100644
--- a/spectrum_manager/src/server.h
+++ b/spectrum_manager/src/server.h
@@ -46,7 +46,7 @@ class Server {
 		/// Destructor
 		virtual ~Server();
 
-		bool start(int port);
+		bool start();
 
 		void *event_handler(enum mg_event event, struct mg_connection *conn);