diff --git a/src/newcertificatewizard/enterdetailspage.ui b/src/newcertificatewizard/enterdetailspage.ui
--- a/src/newcertificatewizard/enterdetailspage.ui
+++ b/src/newcertificatewizard/enterdetailspage.ui
@@ -44,23 +44,6 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="commentLB" >
-       <property name="text" >
-        <string>Comment:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1" >
-      <widget class="QLineEdit" name="commentLE" />
-     </item>
-     <item row="2" column="2" >
-      <widget class="QLabel" name="commentRequiredLB" >
-       <property name="text" >
-        <string>(optional)</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
diff --git a/src/newcertificatewizard/newcertificatewizard.cpp b/src/newcertificatewizard/newcertificatewizard.cpp
--- a/src/newcertificatewizard/newcertificatewizard.cpp
+++ b/src/newcertificatewizard/newcertificatewizard.cpp
@@ -277,7 +277,6 @@
 
     FIELD(QString, name)
     FIELD(QString, email)
-    FIELD(QString, comment)
     FIELD(QString, dn)
 
     FIELD(Subkey::PubkeyAlgo, keyType)
@@ -689,7 +688,6 @@
         registerField(QStringLiteral("dn"), ui.resultLE);
         registerField(QStringLiteral("name"), ui.nameLE);
         registerField(QStringLiteral("email"), ui.emailLE);
-        registerField(QStringLiteral("comment"), ui.commentLE);
         updateForm();
     }
 
@@ -1188,9 +1186,6 @@
     if (attr == QLatin1String("NAME")) {
         return i18n("Name");
     }
-    if (attr == QLatin1String("COMMENT")) {
-        return i18n("Comment");
-    }
     if (attr == QLatin1String("EMAIL")) {
         return i18n("EMail");
     }
@@ -1283,11 +1278,6 @@
     ui.emailLB->hide();
     ui.emailRequiredLB->hide();
 
-    ui.commentLE->hide();
-    ui.commentLE->clear();
-    ui.commentLB->hide();
-    ui.commentRequiredLB->hide();
-
     ui.addEmailToDnCB->hide();
 }
 
@@ -1358,16 +1348,15 @@
     QStringList attrOrder = config.readEntry(pgp() ? "OpenPGPAttributeOrder" : "DNAttributeOrder", QStringList());
     if (attrOrder.empty()) {
         if (pgp()) {
-            attrOrder << QStringLiteral("NAME!") << QStringLiteral("EMAIL!") << QStringLiteral("COMMENT");
+            attrOrder << QStringLiteral("NAME!") << QStringLiteral("EMAIL!");
         } else {
             attrOrder << QStringLiteral("CN!") << QStringLiteral("L") << QStringLiteral("OU") << QStringLiteral("O!") << QStringLiteral("C!") << QStringLiteral("EMAIL!");
         }
     }
 
     QList<QWidget *> widgets;
     widgets.push_back(ui.nameLE);
     widgets.push_back(ui.emailLE);
-    widgets.push_back(ui.commentLE);
 
     QMap<int, Line> lines;
 
@@ -1401,12 +1390,6 @@
                 validator = regex.isEmpty() ? Validation::pgpName() : Validation::pgpName(QRegExp(regex));
             }
             row = row_index_of(ui.nameLE, ui.gridLayout);
-        } else if (attr == QLatin1String("COMMENT")) {
-            if (!pgp()) {
-                continue;
-            }
-            validator = regex.isEmpty() ? Validation::pgpComment() : Validation::pgpComment(QRegExp(regex));
-            row = row_index_of(ui.commentLE, ui.gridLayout);
         } else {
             known = false;
             row = add_row(ui.gridLayout, &dynamicWidgets);
@@ -1474,7 +1457,7 @@
     return Formatting::prettyNameAndEMail(OpenPGP, QString(),
                                           ui.nameLE->text().trimmed(),
                                           ui.emailLE->text().trimmed(),
-                                          ui.commentLE->text().trimmed());
+                                          QString());
 }
 
 static bool has_intermediate_input(const QLineEdit *le)
@@ -1632,11 +1615,7 @@
         s         << Row<        >(i18n("Name:"),              name());
     }
     s             << Row<        >(i18n("Email Address:"),     email());
-    if (pgp()) {
-        if (!comment().isEmpty()) {
-            s     << Row<        >(i18n("Comment:"),           comment());
-        }
-    } else {
+    if (! pgp()) {
         s         << Row<        >(i18n("Subject-DN:"),        DN(dn()).dn(QStringLiteral(",<br>")));
     }
     if (details) {
@@ -1724,9 +1703,6 @@
     if (pgp()) {
         s << "name-real:     " << name()                   << endl;
         s << "name-email:    " << email()                  << endl;
-        if (!comment().isEmpty()) {
-            s << "name-comment:  " << comment()            << endl;
-        }
     } else {
         s << "name-dn:       " << dn()                     << endl;
         s << "name-email:    " << encode_email(email())    << endl;