1 files changed, 10 insertions, 0 deletions
diff --git a/src/de/blinkt/openvpn/fragments/Settings_Authentication.java b/src/de/blinkt/openvpn/fragments/Settings_Authentication.java
index 5dfb73d9..d8c4ac6a 100644
--- a/src/de/blinkt/openvpn/fragments/Settings_Authentication.java
+++ b/src/de/blinkt/openvpn/fragments/Settings_Authentication.java
@@ -76,6 +76,16 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
 		onPreferenceChange(mCipher, mProfile.mCipher);
 		mAuth.setText(mProfile.mAuth);
 		onPreferenceChange(mAuth, mProfile.mAuth);
+
+        if (mProfile.mAuthenticationType == VpnProfile.TYPE_STATICKEYS) {
+            mExpectTLSCert.setEnabled(false);
+            mCheckRemoteCN.setEnabled(false);
+            mUseTLSAuth.setChecked(true);
+        } else {
+            mExpectTLSCert.setEnabled(true);
+            mCheckRemoteCN.setEnabled(true);
+
+        }
 	}
 
 	@Override