diff --git a/conf/gns3_server.conf b/conf/gns3_server.conf
index 0c94063e..c83a49d2 100644
--- a/conf/gns3_server.conf
+++ b/conf/gns3_server.conf
@@ -18,39 +18,39 @@ projects_path = /home/gns3/GNS3/projects
 report_errors = True
 
 ; First console port of the range allocated to devices
-console_start_port_range = 2001
+console_start_port_range = 5000
 ; Last console port of the range allocated to devices
-console_end_port_range = 5000
+console_end_port_range = 10000
 ; First port of the range allocated for inter-device communication. Two ports are allocated per link.
 udp_start_port_range = 10000
 ; Last port of the range allocated for inter-device communication. Two ports are allocated per link
 udp_start_end_range = 20000
-; uBridge executable location
-ubridge_path = /Applications/GNS3.app/Contents/Resources/ubridge
+; uBridge executable location, default: search in PATH
+;ubridge_path = /usr/bin/ubridge
 
 ; Option to enable HTTP authentication.
-auth = True
+auth = False
 ; Username for HTTP authentication.
 user = gns3
 ; Password for HTTP authentication.
 password = gns3
 
 [VPCS]
-; VPCS executable location
-vpcs_path = /usr/bin/vpcs
+; VPCS executable location, default: search in PATH
+;vpcs_path = /usr/bin/vpcs
 
 [Dynamips]
 ; Enable auxiliary console ports on IOS routers
 allocate_aux_console_ports = False
 mmap_support = True
-; Dynamips executable path
-dynamips_path = /usr/bin/dynamips
+; Dynamips executable path, default: search in PATH
+;dynamips_path = /usr/bin/dynamips
 sparse_memory_support = True
 ghost_ios_support = True
 
 [IOU]
-; iouyap executable path
-iouyap_path = /usr/bin/iouyap
+; iouyap executable path, default: search in PATH
+;iouyap_path = /usr/bin/iouyap
 ; Path of your .iourc file. If not provided, the file is searched in $HOME/.iourc
 iourc_path = /home/gns3/.iourc
 ; Validate if the iourc license file is correct. If you turn this off and your licence is invalid IOU will not start and no errors will be shown.
diff --git a/init/gns3.service.systemd b/init/gns3.service.systemd
index a59ba7a4..82a8d7c2 100644
--- a/init/gns3.service.systemd
+++ b/init/gns3.service.systemd
@@ -6,11 +6,12 @@ Type=forking
 User=gns3
 Group=gns3
 PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir /var/run/gns3
-ExecStartPre=/bin/chown -R gns3:gns3 /var/run/gns3/
-ExecStart=/usr/share/gns3/gns3-server/bin/gns3server --log /var/log/gns3/gns3.log --pid /var/run/gns3/gns3.pid --daemon
+ExecStartPre=/bin/mkdir -p /var/log/gns3 /var/run/gns3
+ExecStartPre=/bin/chown -R gns3:gns3 /var/log/gns3 /var/run/gns3
+ExecStart=/usr/local/bin/gns3server --log /var/log/gns3/gns3.log \
+ --pid /var/run/gns3/gns3.pid --daemon
 Restart=on-abort
-PIDFile=/var/run/gns3/gns3-server.pid
+PIDFile=/var/run/gns3/gns3.pid
 
 [Install]
 WantedBy=multi-user.target