diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index eb8cf1f65..b06b8916e 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -464,8 +464,9 @@ void GenCertDialog::genPerson()
 	{
 		/* Message Dialog */
 		QMessageBox::warning(this,
-				tr("Generate ID Failure"),
-				tr("Failed to Generate your new Certificate, maybe PGP password is wrong!"),
-				QMessageBox::Ok);
-	}
-}
+                               tr("Generate ID Failure"),
+                               tr("Failed to Generate your new Certificate, maybe PGP password is wrong!"),
+                               QMessageBox::Ok);
+		reject();
+       }
+}
diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui
index 7276a8b04..fd1b97093 100644
--- a/retroshare-gui/src/gui/GenCertDialog.ui
+++ b/retroshare-gui/src/gui/GenCertDialog.ui
@@ -3,13 +3,13 @@
  <class>GenCertDialog</class>
  <widget class="QDialog" name="GenCertDialog">
   <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>677</width>
-    <height>509</height>
-   </rect>
-  </property>
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>784</width>
+    <height>509</height>
+   </rect>
+  </property>
   <property name="windowTitle">
    <string>Create new Profile</string>
   </property>
@@ -462,13 +462,22 @@ anonymous, you can use a fake email.</string>
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>genPGPuser</tabstop>
-  <tabstop>name_input</tabstop>
-  <tabstop>email_input</tabstop>
-  <tabstop>location_input</tabstop>
- </tabstops>
- <resources>
-  <include location="images.qrc"/>
+  <tabstop>genPGPuser</tabstop>
+  <tabstop>name_input</tabstop>
+  <tabstop>email_input</tabstop>
+  <tabstop>password_input</tabstop>
+  <tabstop>password_input_2</tabstop>
+  <tabstop>location_input</tabstop>
+  <tabstop>hiddenaddr_input</tabstop>
+  <tabstop>hiddenport_spinBox</tabstop>
+  <tabstop>genButton</tabstop>
+  <tabstop>new_gpg_key_checkbox</tabstop>
+  <tabstop>hidden_checkbox</tabstop>
+  <tabstop>importIdentity_PB</tabstop>
+  <tabstop>exportIdentity_PB</tabstop>
+ </tabstops>
+ <resources>
+  <include location="images.qrc"/>
  </resources>
  <connections/>
 </ui>