diff --git a/gns3server/compute/base_node.py b/gns3server/compute/base_node.py
index c45f287b2..d5785d175 100644
--- a/gns3server/compute/base_node.py
+++ b/gns3server/compute/base_node.py
@@ -653,7 +653,6 @@ def aux_type(self, aux_type):
         :param aux_type: console type (string)
         """
 
-        print("SET AUX TYPE", aux_type)
         if aux_type != self._aux_type:
             # get a new port if the aux type change
             if self._aux:
diff --git a/gns3server/compute/dynamips/__init__.py b/gns3server/compute/dynamips/__init__.py
index 0f81a2bb4..ce1d8722e 100644
--- a/gns3server/compute/dynamips/__init__.py
+++ b/gns3server/compute/dynamips/__init__.py
@@ -527,10 +527,6 @@ async def update_vm_settings(self, vm, settings):
         if usage is not None and usage != vm.usage:
             vm.usage = usage
 
-        aux_type = settings.get("aux_type")
-        if aux_type is not None and aux_type != vm.aux_type:
-            vm.aux_type = aux_type
-
         # update the configs if needed
         await self.set_vm_configs(vm, settings)
 
diff --git a/gns3server/compute/dynamips/nodes/router.py b/gns3server/compute/dynamips/nodes/router.py
index 69553881e..15a6aa6f0 100644
--- a/gns3server/compute/dynamips/nodes/router.py
+++ b/gns3server/compute/dynamips/nodes/router.py
@@ -992,7 +992,27 @@ async def set_aux(self, aux):
         """
 
         self.aux = aux
-        await self._hypervisor.send('vm set_aux_tcp_port "{name}" {aux}'.format(name=self._name, aux=aux))
+        await self._hypervisor.send('vm set_aux_tcp_port "{name}" {aux}'.format(name=self._name, aux=self._aux))
+
+    async def set_aux_type(self, aux_type):
+        """
+        Sets the aux type.
+
+        :param aux_type: auxiliary console type
+        """
+
+        if self.aux_type != aux_type:
+            status = await self.get_status()
+            if status == "running":
+                raise DynamipsError('"{name}" must be stopped to change the auxiliary console type to {aux_type}'.format(
+                    name=self._name,
+                    aux_type=aux_type)
+                )
+
+        self.aux_type = aux_type
+
+        if self._aux and aux_type == "telnet":
+            await self._hypervisor.send('vm set_aux_tcp_port "{name}" {aux}'.format(name=self._name, aux=self._aux))
 
     async def reset_console(self):
         """