diff --git a/platform/analysis-impl/src/com/intellij/profile/codeInspection/ProjectInspectionProfileManager.kt b/platform/analysis-impl/src/com/intellij/profile/codeInspection/ProjectInspectionProfileManager.kt
index dcd1697edf70..cf06a8f296f8 100644
--- a/platform/analysis-impl/src/com/intellij/profile/codeInspection/ProjectInspectionProfileManager.kt
+++ b/platform/analysis-impl/src/com/intellij/profile/codeInspection/ProjectInspectionProfileManager.kt
@@ -209,6 +209,23 @@ class ProjectInspectionProfileManager(val project: Project,
     }
   }
 
+  @Synchronized override fun getState(): Element? {
+    val result = Element("settings")
+
+    schemeManagerIprProvider?.writeState(result)
+
+    val state = this.state
+    state.projectProfile = schemeManager.currentSchemeName
+    XmlSerializer.serializeInto(state, result, skipDefaultsSerializationFilter)
+    if (!result.children.isEmpty()) {
+      result.addContent(Element("version").setAttribute("value", VERSION))
+    }
+
+    severityRegistrar.writeExternal(result)
+
+    return wrapState(result)
+  }
+
   @Synchronized override fun loadState(state: Element) {
     val data = state.getChild("settings")
 
@@ -250,23 +267,6 @@ class ProjectInspectionProfileManager(val project: Project,
     }
   }
 
-  @Synchronized override fun getState(): Element? {
-    val result = Element("settings")
-
-    schemeManagerIprProvider?.writeState(result)
-
-    val state = this.state
-    state.projectProfile = schemeManager.currentSchemeName
-    XmlSerializer.serializeInto(state, result, skipDefaultsSerializationFilter)
-    if (!result.children.isEmpty()) {
-      result.addContent(Element("version").setAttribute("value", VERSION))
-    }
-
-    severityRegistrar.writeExternal(result)
-
-    return wrapState(result)
-  }
-
   override fun getScopesManager() = scopeManager
 
   @Synchronized override fun getProfiles(): Collection<Profile> {
diff --git a/platform/projectModel-impl/src/com/intellij/configurationStore/scheme-impl.kt b/platform/projectModel-impl/src/com/intellij/configurationStore/scheme-impl.kt
index eda2ab4802b8..abf0dd809862 100644
--- a/platform/projectModel-impl/src/com/intellij/configurationStore/scheme-impl.kt
+++ b/platform/projectModel-impl/src/com/intellij/configurationStore/scheme-impl.kt
@@ -105,6 +105,12 @@ abstract class SchemeWrapper<out T : Scheme>(name: String) : ExternalizableSchem
   }
 }
 
+class InitializedSchemeWrapper<out T : Scheme>(scheme: T, private val writer: (scheme: T) -> Element) : SchemeWrapper<T>(scheme.name) {
+  override val lazyScheme = lazyOf(scheme)
+
+  override fun writeScheme() = writer(scheme)
+}
+
 fun wrapState(element: Element): Element {
   if (element.isEmpty()) {
     element.name = "state"
diff --git a/plugins/copyright/src/CopyrightManager.kt b/plugins/copyright/src/CopyrightManager.kt
index b9605666c44c..df933e30f966 100644
--- a/plugins/copyright/src/CopyrightManager.kt
+++ b/plugins/copyright/src/CopyrightManager.kt
@@ -15,10 +15,7 @@
  */
 package com.intellij.copyright
 
-import com.intellij.configurationStore.LazySchemeProcessor
-import com.intellij.configurationStore.SchemeDataHolder
-import com.intellij.configurationStore.SchemeWrapper
-import com.intellij.configurationStore.wrapState
+import com.intellij.configurationStore.*
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ModalityState
@@ -71,7 +68,14 @@ class CopyrightManager(private val project: Project, schemeManagerFactory: Schem
     fun getInstance(project: Project) = project.service<CopyrightManager>()
   }
 
-  var defaultCopyright: CopyrightProfile? = null
+  private var defaultCopyrightName: String? = null
+
+  var defaultCopyright: CopyrightProfile?
+    get() = defaultCopyrightName?.let { schemeManager.findSchemeByName(it)?.scheme }
+    set(value) {
+      defaultCopyrightName = value?.name
+    }
+
   val scopeToCopyright = LinkedHashMap<String, String>()
   val options = Options()
 
@@ -103,11 +107,11 @@ class CopyrightManager(private val project: Project, schemeManagerFactory: Schem
   }
 
   fun hasAnyCopyrights(): Boolean {
-    return defaultCopyright != null || !scopeToCopyright.isEmpty()
+    return defaultCopyrightName != null || !scopeToCopyright.isEmpty()
   }
 
   override fun getState(): Element? {
-    val state = Element("settings")
+    val result = Element("settings")
     try {
       if (!scopeToCopyright.isEmpty()) {
         val map = Element(MODULE2COPYRIGHT)
@@ -116,25 +120,26 @@ class CopyrightManager(private val project: Project, schemeManagerFactory: Schem
               .attribute(MODULE, scopeName)
               .attribute(COPYRIGHT, profileName)
         }
-        state.addContent(map)
+        result.addContent(map)
       }
 
-      options.writeExternal(state)
+      options.writeExternal(result)
     }
     catch (e: WriteExternalException) {
       LOG.error(e)
       return null
     }
 
-    if (defaultCopyright != null) {
-      state.setAttribute(DEFAULT, defaultCopyright!!.name)
+    defaultCopyrightName?.let {
+      result.setAttribute(DEFAULT, it)
     }
 
-    return wrapState(state)
+    return wrapState(result)
   }
 
   override fun loadState(state: Element) {
-    val moduleToCopyright = state.getChild(MODULE2COPYRIGHT)
+    val data = state.getChild("settings")
+    val moduleToCopyright = data.getChild(MODULE2COPYRIGHT)
     if (moduleToCopyright != null) {
       for (element in moduleToCopyright.getChildren(ELEMENT)) {
         scopeToCopyright.put(element.getAttributeValue(MODULE), element.getAttributeValue(COPYRIGHT))
@@ -142,8 +147,8 @@ class CopyrightManager(private val project: Project, schemeManagerFactory: Schem
     }
 
     try {
-      defaultCopyright = schemeManager.findSchemeByName(state.getAttributeValue(DEFAULT).orEmpty())?.scheme
-      options.readExternal(state)
+      defaultCopyrightName = data.getAttributeValue(DEFAULT)
+      options.readExternal(data)
     }
     catch (e: InvalidDataException) {
       LOG.error(e)
@@ -172,10 +177,6 @@ class CopyrightManager(private val project: Project, schemeManagerFactory: Schem
   }
 
   fun replaceCopyright(name: String, profile: CopyrightProfile) {
-    if (defaultCopyright?.name == name) {
-      defaultCopyright = profile
-    }
-
     val existingScheme = schemeManager.findSchemeByName(name)
     if (existingScheme == null) {
       addCopyright(profile)
@@ -248,12 +249,6 @@ private val schemeWriter = { scheme: CopyrightProfile ->
   wrapScheme(element)
 }
 
-private class InitializedSchemeWrapper(scheme: CopyrightProfile, private val writer: (scheme: CopyrightProfile) -> Element) : SchemeWrapper<CopyrightProfile>(scheme.name) {
-  override val lazyScheme = lazyOf(scheme)
-
-  override fun writeScheme() = writer(scheme)
-}
-
 private class LazySchemeWrapper(name: String,
                         dataHolder: SchemeDataHolder<SchemeWrapper<CopyrightProfile>>,
                         private val writer: (scheme: CopyrightProfile) -> Element,
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java
index e26f64eacc20..98aac77dd502 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java
@@ -150,12 +150,10 @@ public class ProjectSettingsPanel {
   }
 
   public boolean isModified() {
-    final CopyrightProfile defaultCopyright = myManager.getDefaultCopyright();
+    CopyrightProfile defaultCopyright = myManager.getDefaultCopyright();
     final Object selected = myProfilesComboBox.getSelectedItem();
-    if (defaultCopyright != selected) {
-      if (selected == null) return true;
-      if (defaultCopyright == null) return true;
-      if (!defaultCopyright.equals(selected)) return true;
+    if (defaultCopyright != selected && (selected == null || defaultCopyright == null || !defaultCopyright.equals(selected))) {
+      return true;
     }
     final Map<String, String> map = myManager.getScopeToCopyright();
     if (map.size() != myScopeMappingModel.getItems().size()) return true;