diff --git a/java/execution/impl/src/com/intellij/execution/CommonJavaRunConfigurationParameters.java b/java/execution/impl/src/com/intellij/execution/CommonJavaRunConfigurationParameters.java
index 884dc59391dd..522ba0afcf7b 100644
--- a/java/execution/impl/src/com/intellij/execution/CommonJavaRunConfigurationParameters.java
+++ b/java/execution/impl/src/com/intellij/execution/CommonJavaRunConfigurationParameters.java
@@ -1,17 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package com.intellij.execution;
 
@@ -30,7 +18,7 @@ public interface CommonJavaRunConfigurationParameters extends CommonProgramRunCo
   @Nullable
   String getAlternativeJrePath();
 
-  void setAlternativeJrePath(String path);
+  void setAlternativeJrePath(@Nullable String path);
 
   @Nullable
   String getRunClass();
diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java
index 0c548afab4f9..f5c561f81431 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java
@@ -242,7 +242,7 @@ public class AppletConfigurable extends SettingsEditor<AppletConfiguration> impl
 
   public void checkEditorData(@NotNull AppletConfiguration runConfiguration) {
     AppletConfigurationOptions configuration = runConfiguration.getOptions();
-    configuration.setMainClassName(getClassNameComponent().getText().trim());
+    runConfiguration.setMainClassName(getClassNameComponent().getText().trim());
     configuration.setHtmlFileName(toSystemFormat(getHtmlPathComponent().getText()));
     configuration.setVmParameters(getVMParametersComponent().getText().trim());
     runConfiguration.setPolicyFile(getPolicyFileComponent().getText());
diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java
index 6a018b077638..56abd3dcf81b 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java
@@ -25,6 +25,7 @@ import com.intellij.util.xmlb.annotations.Transient;
 import org.jdom.Element;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -155,7 +156,7 @@ public class AppletConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
   }
 
   @Override
-  public void setMainClassName(final String qualifiedName) {
+  public void setMainClassName(@Nullable String qualifiedName) {
     getOptions().setMainClassName(qualifiedName);
   }
 
diff --git a/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java
index 18fd010f1972..a998aabcd1c0 100644
--- a/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java
@@ -60,7 +60,7 @@ public abstract class AbstractApplicationConfigurationProducer<T extends Applica
   }
 
   private void setupConfiguration(T configuration, final PsiClass aClass, final ConfigurationContext context) {
-    configuration.getOptions().setMainClassName(JavaExecutionUtil.getRuntimeQualifiedName(aClass));
+    configuration.setMainClassName(JavaExecutionUtil.getRuntimeQualifiedName(aClass));
     configuration.setGeneratedName();
     setupConfigurationModule(context, configuration);
   }
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
index 92cb2005d3fe..40dcf4c76e3c 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
@@ -68,11 +68,10 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
     myModuleSelector.applyTo(configuration);
     final String className = getMainClassField().getText();
     final PsiClass aClass = myModuleSelector.findClass(className);
-    ApplicationConfigurationOptions options = configuration.getOptions();
-    options.setMainClassName(aClass != null ? JavaExecutionUtil.getRuntimeQualifiedName(aClass) : className);
-    options.setAlternativeJrePath(myJrePathEditor.getJrePathOrName());
-    options.setAlternativeJrePathEnabled(myJrePathEditor.isAlternativeJreSelected());
-    options.setSwingInspectorEnabled((myVersionDetector.isJre50Configured(configuration) || myVersionDetector.isModuleJre50Configured(configuration)) && myShowSwingInspectorCheckbox.isSelected());
+    configuration.setMainClassName(aClass != null ? JavaExecutionUtil.getRuntimeQualifiedName(aClass) : className);
+    configuration.setAlternativeJrePath(myJrePathEditor.getJrePathOrName());
+    configuration.setAlternativeJrePathEnabled(myJrePathEditor.isAlternativeJreSelected());
+    configuration.getOptions().setSwingInspectorEnabled((myVersionDetector.isJre50Configured(configuration) || myVersionDetector.isModuleJre50Configured(configuration)) && myShowSwingInspectorCheckbox.isSelected());
     configuration.setShortenCommandLine((ShortenCommandLine)myShortenClasspathModeCombo.getComponent().getSelectedItem());
     configuration.setIncludeProvidedScope(myIncludeProvidedDeps.getComponent().isSelected());
 
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
index ba234dcef444..efa0035ce8a9 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -136,6 +136,8 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
   @Override
   public void setMainClassName(@Nullable String qualifiedName) {
     getOptions().setMainClassName(qualifiedName);
+    //noinspection deprecation
+    MAIN_CLASS_NAME = qualifiedName;
   }
 
   @Override
@@ -221,6 +223,8 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
 
   @Override
   public void setAlternativeJrePathEnabled(boolean enabled) {
+    //noinspection deprecation
+    ALTERNATIVE_JRE_PATH_ENABLED = enabled;
     getOptions().setAlternativeJrePathEnabled(enabled);
   }
 
@@ -231,7 +235,9 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
   }
 
   @Override
-  public void setAlternativeJrePath(String path) {
+  public void setAlternativeJrePath(@Nullable String path) {
+    //noinspection deprecation
+    ALTERNATIVE_JRE_PATH = path;
     getOptions().setAlternativeJrePath(path);
   }
 
@@ -248,11 +254,21 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     return JavaRunConfigurationModule.getModulesForClass(getProject(), getOptions().getMainClassName());
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public void readExternal(@NotNull final Element element) {
     super.readExternal(element);
+
     JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element);
     setShortenCommandLine(ShortenCommandLine.readShortenClasspathMethod(element));
+
+    ApplicationConfigurationOptions options = getOptions();
+    MAIN_CLASS_NAME = options.getMainClassName();
+    PROGRAM_PARAMETERS = options.getProgramParameters();
+    WORKING_DIRECTORY = options.getWorkingDirectory();
+    ALTERNATIVE_JRE_PATH = options.getAlternativeJrePath();
+    ALTERNATIVE_JRE_PATH_ENABLED = options.isAlternativeJrePathEnabled();
+    ENABLE_SWING_INSPECTOR = options.isSwingInspectorEnabled();
   }
 
   @Override
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationOptions.kt b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationOptions.kt
index 6ce8e057b9b1..6c43629e658e 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationOptions.kt
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationOptions.kt
@@ -8,7 +8,7 @@ import com.intellij.util.xmlb.annotations.MapAnnotation
 import com.intellij.util.xmlb.annotations.OptionTag
 import java.util.*
 
-class ApplicationConfigurationOptions : JvmConfigurationOptions() {
+open class ApplicationConfigurationOptions : JvmConfigurationOptions() {
   @get:OptionTag("PROGRAM_PARAMETERS")
   var programParameters by string()
 
diff --git a/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java b/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java
index 26db6d78c222..c18a90af6e07 100644
--- a/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java
@@ -106,10 +106,9 @@ public class JavaScratchConfigurable extends SettingsEditor<JavaScratchConfigura
     myCommonProgramParameters.applyTo(configuration);
     myModuleSelector.applyTo(configuration);
 
-    ApplicationConfigurationOptions options = configuration.getOptions();
-    options.setMainClassName(myMainClass.getComponent().getText().trim());
-    options.setAlternativeJrePath(myJrePathEditor.getJrePathOrName());
-    options.setAlternativeJrePathEnabled(myJrePathEditor.isAlternativeJreSelected());
+    configuration.setMainClassName(myMainClass.getComponent().getText().trim());
+    configuration.setAlternativeJrePath(myJrePathEditor.getJrePathOrName());
+    configuration.setAlternativeJrePathEnabled(myJrePathEditor.isAlternativeJreSelected());
 
     final VirtualFile vFile = getVFileFromEditor();
     configuration.SCRATCH_FILE_ID = vFile instanceof VirtualFileWithId ? ((VirtualFileWithId)vFile).getId() : 0;