diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 975f8071098..5db434ca286 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -360,9 +360,12 @@ public class VpnSettings extends SettingsPreferenceFragment implements
         String caCert = "";
         String serverCert = "";
         if (!profile.ipsecUserCert.isEmpty()) {
-            byte[] value = mKeyStore.get(Credentials.USER_PRIVATE_KEY + profile.ipsecUserCert);
-            privateKey = (value == null) ? null : new String(value, Charsets.UTF_8);
-            value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecUserCert);
+            /*
+             * VPN has a special exception in keystore to allow it to use system
+             * UID certs.
+             */
+            privateKey = Credentials.USER_PRIVATE_KEY + profile.ipsecUserCert;
+            byte[] value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecUserCert);
             userCert = (value == null) ? null : new String(value, Charsets.UTF_8);
         }
         if (!profile.ipsecCaCert.isEmpty()) {