diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 0c0821344c99..2e796cc249d6 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -1005,4 +1005,7 @@ javascript.unused.global.declarations.cached=false
 javascript.unused.global.declarations.description=Allows caching of JavaScript unused property declarations; might contain threading issues, experimental
 
 php.register.class.references.in.strings=true
-php.register.class.references.in.strings.description=Enables extended class reference provider for php string literals.
\ No newline at end of file
+php.register.class.references.in.strings.description=Enables extended class reference provider for php string literals.
+
+ide.ssh.one.time.password=false
+ide.ssh.one.time.password.description=Enables support for one-time password authentication for SSH servers
\ No newline at end of file
diff --git a/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java b/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
index 51dc9ea18e1a..5d2b2cfde2c5 100644
--- a/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
+++ b/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
@@ -88,6 +88,7 @@ public class PyCharmInitialConfigurator {
     }
 
     Registry.get("ide.scratch.enabled").setValue(true);
+    Registry.get("ide.ssh.one.time.password").setValue(true);
   }
 
   private static void showInitialConfigurationDialog() {