diff --git a/src/ui/SerialConfigurationWindow.cc b/src/ui/SerialConfigurationWindow.cc
index c5738edb65efbb9e7677166af3a6c908d1a4d4cf..242a323059ced166cab34653703d437926ce8ca4 100644
--- a/src/ui/SerialConfigurationWindow.cc
+++ b/src/ui/SerialConfigurationWindow.cc
@@ -260,9 +260,9 @@ userConfigured(false)
         connect(ui.portName, SIGNAL(currentIndexChanged(QString)), this, SLOT(setPortName(QString)));
         connect(ui.baudRate, SIGNAL(activated(int)), this->link, SLOT(setBaudRateType(int)));
         connect(ui.flowControlCheckBox, SIGNAL(toggled(bool)), this, SLOT(enableFlowControl(bool)));
-        connect(ui.parNone, SIGNAL(toggled(bool)), this, SLOT(setParityNone()));
-        connect(ui.parOdd, SIGNAL(toggled(bool)), this, SLOT(setParityOdd()));
-        connect(ui.parEven, SIGNAL(toggled(bool)), this, SLOT(setParityEven()));
+        connect(ui.parNone, SIGNAL(toggled(bool)), this, SLOT(setParityNone(bool)));
+        connect(ui.parOdd, SIGNAL(toggled(bool)), this, SLOT(setParityOdd(bool)));
+        connect(ui.parEven, SIGNAL(toggled(bool)), this, SLOT(setParityEven(bool)));
         connect(ui.dataBitsSpinBox, SIGNAL(valueChanged(int)), this->link, SLOT(setDataBits(int)));
         connect(ui.stopBitsSpinBox, SIGNAL(valueChanged(int)), this->link, SLOT(setStopBits(int)));
 
@@ -283,7 +283,7 @@ userConfigured(false)
             break;
         default:
             // Enforce default: no parity in link
-            setParityNone();
+            setParityNone(true);
             ui.parNone->setChecked(true);
             break;
         }
@@ -473,19 +473,19 @@ void SerialConfigurationWindow::enableFlowControl(bool flow)
     }
 }
 
-void SerialConfigurationWindow::setParityNone()
+void SerialConfigurationWindow::setParityNone(bool accept)
 {
-    link->setParityType(0);
+    if (accept) link->setParityType(0);
 }
 
-void SerialConfigurationWindow::setParityOdd()
+void SerialConfigurationWindow::setParityOdd(bool accept)
 {
-    link->setParityType(1);
+    if (accept) link->setParityType(1);
 }
 
-void SerialConfigurationWindow::setParityEven()
+void SerialConfigurationWindow::setParityEven(bool accept)
 {
-    link->setParityType(2);
+    if (accept) link->setParityType(2);
 }
 
 void SerialConfigurationWindow::setPortName(QString port)
diff --git a/src/ui/SerialConfigurationWindow.h b/src/ui/SerialConfigurationWindow.h
index 69b020182a8fd20df7108d74731c27327b69ba04..41a95f59df246c71e4dba5fc0bc4120e5b79d075 100644
--- a/src/ui/SerialConfigurationWindow.h
+++ b/src/ui/SerialConfigurationWindow.h
@@ -55,9 +55,9 @@ public:
 public slots:
     void configureCommunication();
     void enableFlowControl(bool flow);
-    void setParityNone();
-    void setParityOdd();
-    void setParityEven();
+    void setParityNone(bool accept);
+    void setParityOdd(bool accept);
+    void setParityEven(bool accept);
     void setPortName(QString port);
     void setLinkName(QString name);
     void setupPortList();