diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui
index 45cbc7f0f..e63bef4bc 100644
--- a/retroshare-gui/src/gui/GenCertDialog.ui
+++ b/retroshare-gui/src/gui/GenCertDialog.ui
@@ -1014,78 +1014,50 @@ p, li { white-space: pre-wrap; }
       </widget>
      </item>
      <item row="6" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Password</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="1" colspan="2">
-      <widget class="QLineEdit" name="genPasswd">
-       <property name="echoMode">
-        <enum>QLineEdit::Password</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QLabel" name="label_9">
-       <property name="text">
-        <string>Password (Again)</string>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="1" colspan="2">
-      <widget class="QLineEdit" name="genPasswd2">
-       <property name="echoMode">
-        <enum>QLineEdit::Password</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="0">
       <widget class="QLabel" name="label_6">
        <property name="text">
         <string>Organisation:</string>
        </property>
       </widget>
      </item>
-     <item row="8" column="1" colspan="2">
+     <item row="6" column="1" colspan="2">
       <widget class="QLineEdit" name="genOrg"/>
      </item>
-     <item row="9" column="0">
+     <item row="7" column="0">
       <widget class="QLabel" name="label_7">
        <property name="text">
         <string>Location:</string>
        </property>
       </widget>
      </item>
-     <item row="9" column="1" colspan="2">
+     <item row="7" column="1" colspan="2">
       <widget class="QLineEdit" name="genLoc"/>
      </item>
-     <item row="10" column="0">
+     <item row="8" column="0">
       <widget class="QLabel" name="label_8">
        <property name="text">
         <string>Country:</string>
        </property>
       </widget>
      </item>
-     <item row="10" column="1" colspan="2">
+     <item row="8" column="1" colspan="2">
       <widget class="QLineEdit" name="genCountry"/>
      </item>
-     <item row="11" column="0" colspan="3">
+     <item row="9" column="0" colspan="3">
       <widget class="Line" name="line_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="12" column="2">
+     <item row="10" column="2">
       <widget class="QPushButton" name="genButton">
        <property name="text">
         <string>Generate New Profil</string>
        </property>
       </widget>
      </item>
-     <item row="12" column="0" colspan="2">
+     <item row="10" column="0" colspan="2">
       <spacer>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -1154,9 +1126,9 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <tabstops>
+  <tabstop>genPGPuser</tabstop>
+  <tabstop>genPGPpassword</tabstop>
   <tabstop>genName</tabstop>
-  <tabstop>genPasswd</tabstop>
-  <tabstop>genPasswd2</tabstop>
   <tabstop>genOrg</tabstop>
   <tabstop>genLoc</tabstop>
   <tabstop>genCountry</tabstop>