--- a/ui/administratorwindow.cpp	Mon Oct 13 17:23:35 2014 +0200
+++ b/ui/administratorwindow.cpp	Mon Oct 13 17:41:12 2014 +0200
@@ -37,14 +37,20 @@
 
 AdministratorWindow::AdministratorWindow() {
     setWindowTitle(tr("TrustBridge Administration"));
-    QString path = QStandardPaths::locate(
-        QStandardPaths::DataLocation, QString("current_certificates.txt"));
-    mCertList.readList(path.toLocal8Bit());
     createActions();
     createMenuBar();
     createContent();
+    loadCurrentCertificates();
+    resize(1190, 500);
+}
+
+void AdministratorWindow::loadCurrentCertificates()
+{
+    QString path = QStandardPaths::locate(
+        QStandardPaths::DataLocation, QString("current_certificates.txt"));
+    certificateModel->removeAll();
+    mCertList.readList(path.toLocal8Bit());
     loadCertificateTable();
-    resize(1190, 500);
 }
 
 void AdministratorWindow::createActions()
@@ -170,6 +176,7 @@
     if (ret == QDialog::Accepted) {
         CreateCertListDialog *dialog = new CreateCertListDialog(this);
         dialog->show();
+        connect (dialog, SIGNAL(creationSuccessful()), this, SLOT(loadCurrentCertificates()));
     }
 }