diff --git a/accountdetails.cpp b/accountdetails.cpp
index 51559062506e89dfda0277da104c99f566c7b48a..487dce5c65ef4d2c8de159bf400fbdf5561dbc05 100644
--- a/accountdetails.cpp
+++ b/accountdetails.cpp
@@ -219,6 +219,7 @@ AccountDetails::setAccount(Account* currentAccount) {
 
     ui->videoEnabledCheckBox->setChecked(currentAccount_->isVideoEnabled());
     ui->autoAnswerCheckBox->setChecked(currentAccount_->isAutoAnswer());
+    ui->upnpCheckBox->setChecked(currentAccount_->isUpnpEnabled());
 }
 
 void
@@ -360,3 +361,8 @@ AccountDetails::on_tabWidget_currentChanged(int index)
         ui->videoCodecView->setCurrentItem(ui->videoCodecView->item(0, 0));
     }
 }
+
+void AccountDetails::on_upnpCheckBox_clicked(bool checked)
+{
+    currentAccount_->setUpnpEnabled(checked);
+}
diff --git a/accountdetails.h b/accountdetails.h
index 29212f98c3d2ecd4c0d99611f2f6bb56b1937a6d..c4baa9a30c3c695b918bfb4b5573f8308f6b5d8c 100644
--- a/accountdetails.h
+++ b/accountdetails.h
@@ -59,6 +59,7 @@ private slots:
     void on_proxyEdit_editingFinished();
     void on_voicemailEdit_editingFinished();
     void on_tabWidget_currentChanged(int index);
+    void on_upnpCheckBox_clicked(bool checked);
 
 private slots:
     void audio_codec_checked(int row, int column);
diff --git a/accountdetails.ui b/accountdetails.ui
index daac5fa502272744698a8896b4981e7fee64dcde..bcb1c2cf902edeb2bd685235659ad51458516eb8 100644
--- a/accountdetails.ui
+++ b/accountdetails.ui
@@ -140,7 +140,7 @@
            <item row="7" column="0">
             <widget class="QCheckBox" name="upnpCheckBox">
              <property name="enabled">
-              <bool>false</bool>
+              <bool>true</bool>
              </property>
              <property name="text">
               <string>UPnP enabled</string>