diff --git a/app.config.ts b/app.config.ts
index 426d2f9..e101a2d 100644
--- a/app.config.ts
+++ b/app.config.ts
@@ -67,8 +67,8 @@ export default ({ config }: ConfigContext) =>
         "@bacons/apple-targets",
         ["./scripts/fdroid/configureFdroid.ts"],
         [
-          "./scripts/detox/configureDetox.ts",
-          { subdomains: "*" }, // uncomment to debug app
+            "./scripts/detox/configureDetox.ts",
+            { subdomains: "*" }, // uncomment to debug app
         ],
         ["./scripts/trustUserCAs.ts"],
         ["./scripts/increaseGradleMemory.ts"],
diff --git a/components/ServerForm.tsx b/components/ServerForm.tsx
index 25f2f04..855ec22 100644
--- a/components/ServerForm.tsx
+++ b/components/ServerForm.tsx
@@ -1,4 +1,5 @@
 import React, { useRef, useState } from "react";
+import { Platform } from "react-native";
 import { Text, Button, Input, CheckBox } from "@ui-kitten/components";
 import { cleanServerUrl, sameServer, verifyEvccServer } from "../utils/server";
 import LoadingIndicator from "./animations/LoadingIndicator";
@@ -6,6 +7,10 @@ import { useTranslation } from "react-i18next";
 import { BasicAuth, Server } from "types";
 import { useAppContext } from "./AppContext";
 import ScanQRCodeButton from "./ScanQRCodeButton";
+import * as DocumentPicker from "expo-document-picker";
+import * as FileSystem from "expo-file-system/legacy";
+import { storeCert } from "../utils/certStorage";
+import NativeClientCertModule from "../modules/client-cert/src/ClientCertModule";
 
 interface ServerFormProps {
   server: Server | undefined;
@@ -44,6 +49,7 @@ export default function ServerForm({
       title: internalServer?.title,
       url,
       basicAuth: internalServer?.basicAuth || {},
+      clientCert: internalServer?.clientCert,
     });
   };
   const setInternalAuth = (basicAuth: BasicAuth) => {
@@ -51,9 +57,56 @@ export default function ServerForm({
       title: internalServer?.title,
       url: internalServer?.url || "",
       basicAuth,
+      clientCert: internalServer?.clientCert,
     });
   };
 
+  const [certPassword, setCertPassword] = useState("");
+  const [certBase64, setCertBase64] = useState<string | undefined>();
+  const [certLabel, setCertLabel] = useState<string | undefined>();
+
+  const toggleClientCert = (enabled: boolean) => {
+    if (!enabled) {
+      setCertBase64(undefined);
+      setCertPassword("");
+      setCertLabel(undefined);
+      setInternalServer({
+        ...internalServer,
+        url: internalServer?.url || "",
+        basicAuth: internalServer?.basicAuth || {},
+        clientCert: undefined,
+      });
+    } else {
+      setInternalServer({
+        ...internalServer,
+        url: internalServer?.url || "",
+        basicAuth: internalServer?.basicAuth || {},
+        clientCert: { label: "", secureStoreKey: "" },
+      });
+    }
+  };
+
+  const pickCertificate = async () => {
+    try {
+      const result = await DocumentPicker.getDocumentAsync({
+        type: ["application/x-pkcs12", "application/pkcs12", "application/octet-stream"],
+        copyToCacheDirectory: true,
+      });
+
+      if (result.canceled) return;
+
+      const file = result.assets[0];
+      const base64 = await FileSystem.readAsStringAsync(file.uri, {
+        encoding: FileSystem.EncodingType.Base64,
+      });
+
+      setCertBase64(base64);
+      setCertLabel(file.name);
+    } catch (e) {
+      console.log("Error picking certificate", e);
+    }
+  };
+
   const validateAndSaveURL = async () => {
     if (inProgress) return;
     if (!internalServer?.title?.trim()) return;
@@ -68,14 +121,32 @@ export default function ServerForm({
       const finalUrl = await verifyEvccServer({
         url: cleanUrl,
         basicAuth: internalServer?.basicAuth || {},
+        clientCert: internalServer?.clientCert,
       });
 
-      const server = {
+      const server: Server = {
         title: internalServer?.title,
         url: finalUrl,
         basicAuth: internalServer?.basicAuth || {},
       };
 
+      if (internalServer?.clientCert && certBase64) {
+        try {
+          NativeClientCertModule.setCertificate(certBase64, certPassword);
+        } catch {
+          throw new Error(t("servers.manually.clientCertNote") + " (Password invalid?)");
+        }
+        const key = "cert_" + Date.now();
+        await storeCert(key, certBase64, certPassword);
+        server.clientCert = {
+          label: certLabel || "Certificate",
+          secureStoreKey: key,
+        };
+      } else if (internalServer?.clientCert?.secureStoreKey) {
+        // keep existing cert during update
+        server.clientCert = internalServer.clientCert;
+      }
+
       const sameServerCount = servers.filter((s) =>
         sameServer(server, s),
       ).length;
@@ -183,6 +254,66 @@ export default function ServerForm({
         </>
       )}
 
+      {Platform.OS === "android" && (
+        <>
+          <CheckBox
+            style={{ marginTop: 8, marginBottom: 16 }}
+            checked={!!internalServer?.clientCert}
+            onChange={toggleClientCert}
+            testID="serverFormClientCert"
+          >
+            {t("servers.manually.clientCertRequired")}
+          </CheckBox>
+
+          {!!internalServer?.clientCert && (
+            <>
+              <Button
+                style={{ marginTop: 8, marginBottom: certLabel ? 4 : 16 }}
+                appearance={certLabel ? "filled" : "outline"}
+                status={certLabel ? "success" : "basic"}
+                onPress={pickCertificate}
+              >
+                {certLabel
+                  ? `✓ ${certLabel}`
+                  : internalServer?.clientCert?.label
+                  ? `✓ ${internalServer.clientCert.label}`
+                  : t("servers.manually.clientCertSelect")}
+              </Button>
+
+              {certLabel && (
+                <Text style={{ marginBottom: 12 }} category="c1" appearance="hint">
+                  {t("servers.manually.clientCertNote")}
+                </Text>
+              )}
+
+              {!!certBase64 && (
+                <Input
+                  style={{ marginTop: 4, marginBottom: 16 }}
+                  size="large"
+                  status="basic"
+                  onChangeText={setCertPassword}
+                  value={certPassword}
+                  inputMode="text"
+                  keyboardType="default"
+                  autoCapitalize="none"
+                  returnKeyType="go"
+                  autoCorrect={false}
+                  placeholder={t("servers.manually.clientCertPassword")}
+                  secureTextEntry
+                  onSubmitEditing={validateAndSaveURL}
+                />
+              )}
+
+              {!certLabel && !!internalServer?.clientCert && (
+                <Text style={{ marginTop: 4, marginBottom: 16 }} category="c1" appearance="hint">
+                  {t("servers.manually.clientCertNote")}
+                </Text>
+              )}
+            </>
+          )}
+        </>
+      )}
+
       <Button
         style={{ marginTop: 16, marginBottom: 16 }}
         appearance="filled"
diff --git a/i18n/de.json b/i18n/de.json
index 0aee82e..287afec 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -30,7 +30,11 @@
         "scanning": "erkennen..."
       },
       "title": "Titel",
-      "serverExistsAlready": "Dieser Server existiert bereits."
+      "serverExistsAlready": "Dieser Server existiert bereits.",
+      "clientCertRequired": "Client-Zertifikat verwenden",
+      "clientCertSelect": "Zertifikat auswählen (.p12)",
+      "clientCertPassword": "Zertifikat-Passwort",
+      "clientCertNote": "Das Zertifikat wird beim Verbindungsaufbau verwendet. Die Prüfung beim Speichern wird übersprungen."
     },
     "removeServer": "Server entfernen",
     "search": {
diff --git a/i18n/en.json b/i18n/en.json
index a56fdcc..9302d5d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -30,7 +30,11 @@
         "scanning": "detecting..."
       },
       "title": "Title",
-      "serverExistsAlready": "This server already exists."
+      "serverExistsAlready": "This server already exists.",
+      "clientCertRequired": "Use client certificate",
+      "clientCertSelect": "Select certificate (.p12)",
+      "clientCertPassword": "Certificate password",
+      "clientCertNote": "The certificate will be used when connecting to the server. Verification is skipped."
     },
     "removeServer": "Remove server",
     "search": {
diff --git a/modules/client-cert/LICENSE b/modules/client-cert/LICENSE
new file mode 100644
index 0000000..30b20e3
--- /dev/null
+++ b/modules/client-cert/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-present 650 Industries, Inc. (aka Expo)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/modules/client-cert/android/build.gradle b/modules/client-cert/android/build.gradle
new file mode 100644
index 0000000..6032927
--- /dev/null
+++ b/modules/client-cert/android/build.gradle
@@ -0,0 +1,18 @@
+plugins {
+  id 'com.android.library'
+  id 'expo-module-gradle-plugin'
+}
+
+group = 'expo.modules.clientcert'
+version = '0.1.0'
+
+android {
+  namespace "expo.modules.clientcert"
+  defaultConfig {
+    versionCode 1
+    versionName "0.1.0"
+  }
+  lintOptions {
+    abortOnError false
+  }
+}
diff --git a/modules/client-cert/android/src/main/AndroidManifest.xml b/modules/client-cert/android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..bdae66c
--- /dev/null
+++ b/modules/client-cert/android/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest>
+</manifest>
diff --git a/modules/client-cert/android/src/main/java/expo/modules/clientcert/ClientCertModule.kt b/modules/client-cert/android/src/main/java/expo/modules/clientcert/ClientCertModule.kt
new file mode 100644
index 0000000..9345b81
--- /dev/null
+++ b/modules/client-cert/android/src/main/java/expo/modules/clientcert/ClientCertModule.kt
@@ -0,0 +1,94 @@
+package expo.modules.clientcert
+
+import android.webkit.ClientCertRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class ClientCertModule : Module() {
+  override fun definition() = ModuleDefinition {
+    Name("ClientCert")
+
+    Function("setCertificate") { p12Base64: String, pass: String ->
+      ClientCertStore.setCert(p12Base64, pass)
+      installClientCertHandlerIfNeeded()
+    }
+
+    Function("clearCertificate") {
+      ClientCertStore.clear()
+    }
+  }
+
+  private fun installClientCertHandlerIfNeeded() {
+    val activity = appContext.currentActivity ?: return
+    activity.runOnUiThread {
+      // Walk the view hierarchy and patch every WebView we find
+      val rootView = activity.window.decorView
+      patchWebViews(rootView)
+    }
+  }
+
+  private fun patchWebViews(view: android.view.View) {
+    if (view is WebView) {
+      // Only install once – check the current client type
+      val existing = view.tag as? Boolean
+      if (existing != true) {
+        view.tag = true
+        val originalClient = view.webViewClient
+        view.webViewClient = object : WebViewClient() {
+          override fun onReceivedClientCertRequest(
+            view: WebView,
+            request: ClientCertRequest
+          ) {
+            val key = ClientCertStore.getPrivateKey()
+            val chain = ClientCertStore.getCertificateChain()
+            if (key != null && chain != null) {
+              request.proceed(key, chain)
+            } else {
+              request.cancel()
+            }
+          }
+
+          // Forward all other methods to original client
+          override fun shouldOverrideUrlLoading(
+            view: WebView,
+            url: String
+          ) = originalClient.shouldOverrideUrlLoading(view, url)
+
+          override fun onPageStarted(
+            view: WebView,
+            url: String,
+            favicon: android.graphics.Bitmap?
+          ) = originalClient.onPageStarted(view, url, favicon)
+
+          override fun onPageFinished(view: WebView, url: String) =
+            originalClient.onPageFinished(view, url)
+
+          override fun onReceivedError(
+            view: WebView,
+            request: android.webkit.WebResourceRequest,
+            error: android.webkit.WebResourceError
+          ) = originalClient.onReceivedError(view, request, error)
+
+          override fun onReceivedHttpError(
+            view: WebView,
+            request: android.webkit.WebResourceRequest,
+            errorResponse: android.webkit.WebResourceResponse
+          ) = originalClient.onReceivedHttpError(view, request, errorResponse)
+
+          override fun onReceivedSslError(
+            view: WebView,
+            handler: android.webkit.SslErrorHandler,
+            error: android.net.http.SslError
+          ) = originalClient.onReceivedSslError(view, handler, error)
+        }
+      }
+    }
+    if (view is android.view.ViewGroup) {
+      for (i in 0 until view.childCount) {
+        patchWebViews(view.getChildAt(i))
+      }
+    }
+  }
+}
diff --git a/modules/client-cert/android/src/main/java/expo/modules/clientcert/ClientCertStore.kt b/modules/client-cert/android/src/main/java/expo/modules/clientcert/ClientCertStore.kt
new file mode 100644
index 0000000..083afd0
--- /dev/null
+++ b/modules/client-cert/android/src/main/java/expo/modules/clientcert/ClientCertStore.kt
@@ -0,0 +1,40 @@
+package expo.modules.clientcert
+
+import java.security.KeyStore
+import java.security.PrivateKey
+import java.security.cert.X509Certificate
+
+object ClientCertStore {
+    private var privateKey: PrivateKey? = null
+    private var certificateChain: Array<X509Certificate>? = null
+
+    @JvmStatic
+    fun getPrivateKey(): PrivateKey? = privateKey
+
+    @JvmStatic
+    fun getCertificateChain(): Array<X509Certificate>? = certificateChain
+
+    fun setCert(p12Base64: String, pass: String) {
+        try {
+            val bytes = android.util.Base64.decode(p12Base64, android.util.Base64.DEFAULT)
+            val ks = KeyStore.getInstance("PKCS12")
+            ks.load(java.io.ByteArrayInputStream(bytes), pass.toCharArray())
+            val aliases = ks.aliases()
+            if (aliases.hasMoreElements()) {
+                val alias = aliases.nextElement()
+                privateKey = ks.getKey(alias, pass.toCharArray()) as PrivateKey
+                val certs = ks.getCertificateChain(alias)
+                certificateChain = certs?.map { it as X509Certificate }?.toTypedArray()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            clear()
+            throw e
+        }
+    }
+
+    fun clear() {
+        privateKey = null
+        certificateChain = null
+    }
+}
diff --git a/modules/client-cert/expo-module.config.json b/modules/client-cert/expo-module.config.json
new file mode 100644
index 0000000..4d58e10
--- /dev/null
+++ b/modules/client-cert/expo-module.config.json
@@ -0,0 +1,6 @@
+{
+  "platforms": ["android"],
+  "android": {
+    "modules": ["expo.modules.clientcert.ClientCertModule"]
+  }
+}
diff --git a/modules/client-cert/src/ClientCertModule.ts b/modules/client-cert/src/ClientCertModule.ts
new file mode 100644
index 0000000..fcd4e80
--- /dev/null
+++ b/modules/client-cert/src/ClientCertModule.ts
@@ -0,0 +1,3 @@
+import { requireNativeModule } from 'expo-modules-core';
+
+export default requireNativeModule('ClientCert');
diff --git a/package-lock.json b/package-lock.json
index 40e2a53..c05f5f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,10 +25,12 @@
         "expo-build-properties": "~56.0.18",
         "expo-camera": "~56.0.8",
         "expo-dev-client": "~56.0.20",
+        "expo-document-picker": "~56.0.0",
         "expo-file-system": "~56.0.7",
         "expo-haptics": "~56.0.3",
         "expo-linking": "~56.0.14",
         "expo-localization": "~56.0.6",
+        "expo-secure-store": "~56.0.0",
         "expo-sharing": "~56.0.17",
         "expo-splash-screen": "~56.0.10",
         "expo-status-bar": "~56.0.4",
@@ -66,6 +68,7 @@
         "eslint-plugin-react": "^7.33.2",
         "eslint-plugin-react-native": "^5.0.0",
         "jest": "^30.4.2",
+        "patch-package": "^8.0.1",
         "prettier": "^3.7.4",
         "react-native-launch-arguments": "^4.1.1",
         "ts-jest": "^29.4.6",
@@ -74,6 +77,14 @@
         "typescript": "^6.0.3"
       }
     },
+    "modules/client-cert": {
+      "version": "1.0.0",
+      "extraneous": true,
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.29.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
@@ -5560,6 +5571,13 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
     "node_modules/abort-controller": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
@@ -8497,6 +8515,15 @@
         "expo": "*"
       }
     },
+    "node_modules/expo-document-picker": {
+      "version": "56.0.4",
+      "resolved": "https://registry.npmjs.org/expo-document-picker/-/expo-document-picker-56.0.4.tgz",
+      "integrity": "sha512-75Apf74XNkYYohObIH19VZw42xpe0gmEnPccuzGXKVAzlvTYCfibSgW17F+6vt4paOfZEnAoZ1QFZM6dmaujRA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
     "node_modules/expo-file-system": {
       "version": "56.0.8",
       "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-56.0.8.tgz",
@@ -8630,6 +8657,15 @@
         "react-native": "*"
       }
     },
+    "node_modules/expo-secure-store": {
+      "version": "56.0.4",
+      "resolved": "https://registry.npmjs.org/expo-secure-store/-/expo-secure-store-56.0.4.tgz",
+      "integrity": "sha512-hjEi/gmpdFFJ9lYbdp3k3p/WchV7Gi0Qt8jt/m/0WJadqQrskafHAlDxbZkII1cN3Yd7zp9Lvkeq3UfGhSwirQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
     "node_modules/expo-server": {
       "version": "56.0.5",
       "resolved": "https://registry.npmjs.org/expo-server/-/expo-server-56.0.5.tgz",
@@ -8961,6 +8997,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/find-yarn-workspace-root": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
+      "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "micromatch": "^4.0.2"
+      }
+    },
     "node_modules/flat": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
@@ -11636,6 +11682,26 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/json-stable-stringify": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz",
+      "integrity": "sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "isarray": "^2.0.5",
+        "jsonify": "^0.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -11643,6 +11709,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/json-stable-stringify/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -11668,6 +11741,16 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/jsonify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+      "dev": true,
+      "license": "Public Domain",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/jsx-ast-utils": {
       "version": "3.3.5",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
@@ -11694,6 +11777,16 @@
         "json-buffer": "3.0.1"
       }
     },
+    "node_modules/klaw-sync": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
+      "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.11"
+      }
+    },
     "node_modules/kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -13604,6 +13697,74 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/patch-package": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.1.tgz",
+      "integrity": "sha512-VsKRIA8f5uqHQ7NGhwIna6Bx6D9s/1iXlA1hthBVBEbkq+t4kXD0HHt+rJhf/Z+Ci0F/HCB2hvn0qLdLG+Qxlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@yarnpkg/lockfile": "^1.1.0",
+        "chalk": "^4.1.2",
+        "ci-info": "^3.7.0",
+        "cross-spawn": "^7.0.3",
+        "find-yarn-workspace-root": "^2.0.0",
+        "fs-extra": "^10.0.0",
+        "json-stable-stringify": "^1.0.2",
+        "klaw-sync": "^6.0.0",
+        "minimist": "^1.2.6",
+        "open": "^7.4.2",
+        "semver": "^7.5.3",
+        "slash": "^2.0.0",
+        "tmp": "^0.2.4",
+        "yaml": "^2.2.2"
+      },
+      "bin": {
+        "patch-package": "index.js"
+      },
+      "engines": {
+        "node": ">=14",
+        "npm": ">5"
+      }
+    },
+    "node_modules/patch-package/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/patch-package/node_modules/semver": {
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/patch-package/node_modules/slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
diff --git a/package.json b/package.json
index 877e0a4..1122dc6 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
   "version": "1.4.0",
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
+    "postinstall": "patch-package",
     "start": "expo start",
     "android": "expo run:android",
     "ios": "expo run:ios",
@@ -37,10 +38,12 @@
     "expo-build-properties": "~56.0.18",
     "expo-camera": "~56.0.8",
     "expo-dev-client": "~56.0.20",
+    "expo-document-picker": "~56.0.0",
     "expo-file-system": "~56.0.7",
     "expo-haptics": "~56.0.3",
     "expo-linking": "~56.0.14",
     "expo-localization": "~56.0.6",
+    "expo-secure-store": "~56.0.0",
     "expo-sharing": "~56.0.17",
     "expo-splash-screen": "~56.0.10",
     "expo-status-bar": "~56.0.4",
@@ -78,6 +81,7 @@
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-native": "^5.0.0",
     "jest": "^30.4.2",
+    "patch-package": "^8.0.1",
     "prettier": "^3.7.4",
     "react-native-launch-arguments": "^4.1.1",
     "ts-jest": "^29.4.6",
diff --git a/patches/react-native-webview+13.16.1.patch b/patches/react-native-webview+13.16.1.patch
new file mode 100644
index 0000000..c07d56b
--- /dev/null
+++ b/patches/react-native-webview+13.16.1.patch
@@ -0,0 +1,35 @@
+diff --git a/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewClient.java b/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewClient.java
+index 0287e1c..7835002 100644
+--- a/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewClient.java
++++ b/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewClient.java
+@@ -10,6 +10,7 @@ import android.webkit.HttpAuthHandler;
+ import android.webkit.RenderProcessGoneDetail;
+ import android.webkit.SslErrorHandler;
+ import android.webkit.WebResourceRequest;
++import android.webkit.ClientCertRequest;
+ import android.webkit.WebResourceResponse;
+ import android.webkit.WebView;
+ import android.webkit.WebViewClient;
+@@ -327,4 +328,22 @@ public class RNCWebViewClient extends WebViewClient {
+     public void setProgressChangedFilter(RNCWebView.ProgressChangedFilter filter) {
+         progressChangedFilter = filter;
+     }
++
++  @Override
++  public void onReceivedClientCertRequest(WebView view, ClientCertRequest request) {
++    try {
++        Class<?> clazz = Class.forName("expo.modules.clientcert.ClientCertStore");
++        java.security.PrivateKey key = (java.security.PrivateKey) clazz.getMethod("getPrivateKey").invoke(null);
++        java.security.cert.X509Certificate[] chain = (java.security.cert.X509Certificate[]) clazz.getMethod("getCertificateChain").invoke(null);
++        
++        if (key != null && chain != null) {
++            request.proceed(key, chain);
++            return;
++        }
++    } catch (Exception e) {
++        android.util.Log.e("ClientCertPatch", "Error loading client cert", e);
++    }
++    super.onReceivedClientCertRequest(view, request);
++  }
++
+ }
diff --git a/screens/MainScreen.tsx b/screens/MainScreen.tsx
index c6a587c..da57e3e 100644
--- a/screens/MainScreen.tsx
+++ b/screens/MainScreen.tsx
@@ -27,6 +27,8 @@ import { shareFileFromUrl } from "utils/shareFile";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import Spinner from "components/animations/Spinner";
 import { testingEnvironment } from "helper/launchArguments";
+import NativeClientCertModule from "modules/client-cert/src/ClientCertModule";
+import { loadCert } from "utils/certStorage";
 
 export default function MainScreen({
   navigation,
@@ -65,6 +67,25 @@ export default function MainScreen({
     }
   }, [targetPath, isConnected, clearTargetPath]);
 
+  useEffect(() => {
+    (async () => {
+      if (activeServer?.clientCert) {
+        try {
+          const cert = await loadCert(activeServer.clientCert.secureStoreKey);
+          if (cert) {
+            NativeClientCertModule.setCertificate(cert.p12Base64, cert.password);
+          } else {
+            console.warn("Client cert not found in secure store");
+          }
+        } catch (e) {
+          console.error("Failed to load client cert", e);
+        }
+      } else {
+        NativeClientCertModule.clearCertificate();
+      }
+    })();
+  }, [activeServer]);
+
   // Reconnect if connection is lost
   useEffect(() => {
     let intervalId: NodeJS.Timeout | undefined;
diff --git a/types.ts b/types.ts
index c4fc3b1..54a0dd4 100644
--- a/types.ts
+++ b/types.ts
@@ -1,9 +1,15 @@
 import { NavigatorScreenParams } from "@react-navigation/native";
 
+export interface ClientCert {
+  label: string;
+  secureStoreKey: string;
+}
+
 export interface Server {
   title?: string;
   url: string;
   basicAuth: BasicAuth;
+  clientCert?: ClientCert;
 }
 
 export interface BasicAuth {
diff --git a/utils/certStorage.ts b/utils/certStorage.ts
new file mode 100644
index 0000000..92c5938
--- /dev/null
+++ b/utils/certStorage.ts
@@ -0,0 +1,21 @@
+import * as SecureStore from "expo-secure-store";
+
+export async function storeCert(key: string, p12Base64: string, password: string) {
+  await SecureStore.setItemAsync(key, p12Base64);
+  await SecureStore.setItemAsync(`${key}_pass`, password);
+}
+
+export async function loadCert(key: string): Promise<{ p12Base64: string; password: string } | null> {
+  const p12Base64 = await SecureStore.getItemAsync(key);
+  const password = await SecureStore.getItemAsync(`${key}_pass`);
+  
+  if (p12Base64 && password !== null) {
+    return { p12Base64, password };
+  }
+  return null;
+}
+
+export async function deleteCert(key: string) {
+  await SecureStore.deleteItemAsync(key);
+  await SecureStore.deleteItemAsync(`${key}_pass`);
+}
diff --git a/utils/server.ts b/utils/server.ts
index 060c620..13d9216 100644
--- a/utils/server.ts
+++ b/utils/server.ts
@@ -20,6 +20,12 @@ export function cleanServerUrl(url: string) {
 }
 
 export async function verifyEvccServer(server: Server) {
+  if (server.clientCert) {
+    // We cannot verify mTLS connections using plain axios easily.
+    // Skip verification and assume it works; it will be tested when the WebView loads.
+    return cleanServerUrl(server.url);
+  }
+
   const options: AxiosRequestConfig = { ...AXIOS_OPTIONS };
   if (server.basicAuth) {
     const { username, password } = server.basicAuth;