diff --git a/misc/CA.xca b/misc/CA.xca
index 6cbf4091..08374fa9 100644
Binary files a/misc/CA.xca and b/misc/CA.xca differ
diff --git a/misc/TLS_client.xca b/misc/TLS_client.xca
index 22c5f1e5..85ab00c2 100644
Binary files a/misc/TLS_client.xca and b/misc/TLS_client.xca differ
diff --git a/misc/TLS_server.xca b/misc/TLS_server.xca
index f24123a9..92332c1a 100644
Binary files a/misc/TLS_server.xca and b/misc/TLS_server.xca differ
diff --git a/ui/NewX509.ui b/ui/NewX509.ui
index 2a375487..46cf44a3 100644
--- a/ui/NewX509.ui
+++ b/ui/NewX509.ui
@@ -1594,5 +1594,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>selfSignRB</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>authKey</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>372</x>
+     <y>319</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>625</x>
+     <y>172</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
diff --git a/widgets/NewX509_ext.cpp b/widgets/NewX509_ext.cpp
index f020f1fc..1fddf6e3 100644
--- a/widgets/NewX509_ext.cpp
+++ b/widgets/NewX509_ext.cpp
@@ -47,7 +47,6 @@ x509v3ext NewX509::getSubKeyIdent()
 	return ext;
 }
 
-
 x509v3ext NewX509::getOCSPstaple()
 {
 	x509v3ext ext;
@@ -61,7 +60,7 @@ x509v3ext NewX509::getOCSPstaple()
 x509v3ext NewX509::getAuthKeyIdent()
 {
 	x509v3ext ext;
-	if (!authKey->isChecked() || !authKey->isEnabled())
+	if (!authKey->isChecked() || !authKey->isEnabled() || selfSignRB->isChecked())
 		return ext;
 
 	QString x = "keyid,issuer";