diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
index c621a48c7..a3a9958f2 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
@@ -230,10 +230,6 @@ public class SettingsController extends BaseController {
                     .popChangeHandler(new VerticalChangeHandler()));
         });
 
-        if (userEntity.getClientCertificate() != null) {
-            certificateSetup.setTitle(R.string.nc_client_cert_change);
-        }
-
 
         String host = null;
         int port = -1;
@@ -281,6 +277,12 @@ public class SettingsController extends BaseController {
         dispose(null);
         userEntity = userUtils.getCurrentUser();
 
+        if (!TextUtils.isEmpty(userEntity.getClientCertificate())) {
+            certificateSetup.setTitle(R.string.nc_client_cert_change);
+        } else {
+            certificateSetup.setTitle(R.string.nc_client_cert_setup);
+        }
+
         if ("No proxy".equals(appPreferences.getProxyType()) || appPreferences.getProxyType() == null) {
             hideProxySettings();
         } else {