diff --git a/app/src/main/java/corewala/buran/io/keymanager/BuranKeyManager.kt b/app/src/main/java/corewala/buran/io/keymanager/BuranKeyManager.kt
index 89247f3..a5cd99a 100644
--- a/app/src/main/java/corewala/buran/io/keymanager/BuranKeyManager.kt
+++ b/app/src/main/java/corewala/buran/io/keymanager/BuranKeyManager.kt
@@ -20,9 +20,8 @@ class BuranKeyManager(val context: Context, val onKeyError: (error: String) -> U
 
     //If the user has a key loaded load it here - or else return null
     fun getFactory(clientCertPassword: String?): KeyManagerFactory? {
-        val isClientCertActive = prefs.getBoolean(Buran.PREF_KEY_CLIENT_CERT_ACTIVE, false)
         return when {
-            isClientCertActive and (clientCertPassword != null) -> {
+            clientCertPassword != null -> {
                 lastCallUsedKey = true
                 val keyStore: KeyStore = KeyStore.getInstance("pkcs12")
 
diff --git a/app/src/main/java/corewala/buran/ui/GemActivity.kt b/app/src/main/java/corewala/buran/ui/GemActivity.kt
index 6291792..227c966 100644
--- a/app/src/main/java/corewala/buran/ui/GemActivity.kt
+++ b/app/src/main/java/corewala/buran/ui/GemActivity.kt
@@ -415,7 +415,7 @@ class GemActivity : AppCompatActivity() {
                     .setTitle(getString(R.string.client_certificate_required))
                     .setMessage(state.header.meta)
 
-                if(prefs.getString(Buran.PREF_KEY_CLIENT_CERT_HUMAN_READABLE, null) != null){
+                if(prefs.getBoolean(Buran.PREF_KEY_CLIENT_CERT_ACTIVE, false)){
                     builder
                         .setPositiveButton(getString(R.string.use_client_certificate).toUpperCase()) { _, _ ->
                             if(prefs.getBoolean("use_biometrics", false)){