diff --git a/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.cpp b/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.cpp
index 59df42e5899..de33dbf63de 100644
--- a/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.cpp
+++ b/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.cpp
@@ -34,6 +34,7 @@
 
 #include "blackberrydebugtokenreader.h"
 #include "blackberrydeviceconfiguration.h"
+#include "blackberrysigningutils.h"
 #include "qnxconstants.h"
 
 #include <projectexplorer/devicesupport/devicemanager.h>
@@ -87,6 +88,7 @@ void BarDescriptorEditorAuthorInformationWidget::setAuthorFromDebugToken()
             debugTokens << bbDevice->debugToken();
         }
     }
+    debugTokens << BlackBerrySigningUtils::instance().debugTokens();
     debugTokens.removeDuplicates();
 
     bool ok;
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
index 386276f93b9..8f36c1bc6c1 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
@@ -242,9 +242,7 @@ void BlackBerryDeviceConfigurationWidget::populateDebugTokenCombo(const QString&
 {
     ui->debugToken->clear();
     ui->debugToken->addItems(m_utils.debugTokens());
-    const int index = ui->debugToken->findText(current);
-    if (index != -1)
-        ui->debugToken->setCurrentIndex(index);
+    ui->debugToken->setCurrentText(current);
 }
 
 void BlackBerryDeviceConfigurationWidget::updateDebugTokenCombo()