diff --git a/gns3server/modules/dynamips/__init__.py b/gns3server/modules/dynamips/__init__.py
index 9d428d25..38595ef5 100644
--- a/gns3server/modules/dynamips/__init__.py
+++ b/gns3server/modules/dynamips/__init__.py
@@ -293,10 +293,8 @@ class Dynamips(IModule):
         """
         Set or update settings.
 
-        Mandatory request parameters:
-        - path (path to the Dynamips executable)
-
         Optional request parameters:
+        - path (path to the Dynamips executable)
         - working_dir (path to a working directory)
         - project_name
 
@@ -311,7 +309,9 @@ class Dynamips(IModule):
 
         #TODO: JSON schema validation
         if not self._hypervisor_manager:
-            self._dynamips = request.pop("path")
+
+            if "path" in request:
+                self._dynamips = request.pop("path")
 
             if "working_dir" in request:
                 self._working_dir = request.pop("working_dir")
diff --git a/gns3server/modules/virtualbox/virtualbox_vm.py b/gns3server/modules/virtualbox/virtualbox_vm.py
index c7975d32..014b7e3b 100644
--- a/gns3server/modules/virtualbox/virtualbox_vm.py
+++ b/gns3server/modules/virtualbox/virtualbox_vm.py
@@ -106,7 +106,7 @@ class VirtualBoxVM(object):
         self._enable_console = True
         self._vmname = vmname
         self._adapter_start_index = 0
-        self._adapter_type = "Automatic"
+        self._adapter_type = "Intel PRO/1000 MT Desktop (82540EM)"
 
         working_dir_path = os.path.join(working_dir, "vbox", "vm-{}".format(self._id))
 
@@ -156,7 +156,7 @@ class VirtualBoxVM(object):
                          "vmname": self._vmname,
                          "adapters": self.adapters,
                          "adapter_start_index": self._adapter_start_index,
-                         "adapter_type": "Automatic",
+                         "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
                          "console": self._console,
                          "enable_console": self._enable_console,
                          "headless": self._headless}