diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/IdentifiersDeobfuscation.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/IdentifiersDeobfuscation.java
index 9fc0a2f74..84b758f91 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/IdentifiersDeobfuscation.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/IdentifiersDeobfuscation.java
@@ -552,7 +552,7 @@ public class IdentifiersDeobfuscation {
      */
     public static GraphTextWriter appendObfuscatedIdentifier(SWF swf, Set<String> used, String s, GraphTextWriter writer) {
         Map<String, String> map = new LinkedHashMap<>();
-        if (Configuration.useSafeStr.get() && swf != null) {
+        if (Configuration.autoDeobfuscateIdentifiers.get() && swf != null) {
             map = swf.getObfuscatedIdentifiersMap();
             used.add(s);
             if (map.containsKey(s)) {
@@ -587,7 +587,7 @@ public class IdentifiersDeobfuscation {
         }
         
         Map<String, String> map = new LinkedHashMap<>();
-        if (Configuration.useSafeStr.get()) {
+        if (Configuration.autoDeobfuscateIdentifiers.get()) {
             
             if (swf != null) {
                 map = swf.getObfuscatedIdentifiersMap();
@@ -623,7 +623,7 @@ public class IdentifiersDeobfuscation {
             return s;
         }
 
-        if (Configuration.useSafeStr.get()) {
+        if (Configuration.autoDeobfuscateIdentifiers.get()) {
             String ret = IdentifiersDeobfuscation.SAFE_STR_PREFIX + map.size();
             map.put(s, ret);
             used.add(s);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
index 478a38719..078308321 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
@@ -1161,7 +1161,7 @@ public final class Configuration {
     
     @ConfigurationDefaultBoolean(false)
     @ConfigurationCategory("script")
-    public static ConfigurationItem<Boolean> useSafeStr = null;
+    public static ConfigurationItem<Boolean> autoDeobfuscateIdentifiers = null;
 
     private static Map<String, String> configurationDescriptions = new LinkedHashMap<>();
     private static Map<String, String> configurationTitles = new LinkedHashMap<>();
diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
index d3d968093..5aa9a12c1 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
@@ -99,7 +99,9 @@ public abstract class MainFrameMenu implements MenuBuilder {
     //private ConfigurationItemChangeListener<Boolean> configListenerCacheOnDisk;
     private ConfigurationItemChangeListener<Boolean> configListenerGotoMainClassOnStartup;
 
-    private ConfigurationItemChangeListener<Boolean> configListenerAutoRenameIdentifiers;
+    //private ConfigurationItemChangeListener<Boolean> configListenerAutoRenameIdentifiers;
+
+    private ConfigurationItemChangeListener<Boolean> configListenerAutoDeobfuscateIdentifiers;
 
     private ConfigurationItemChangeListener<Boolean> configListenerAutoOpenLoadedSWFs;
 
@@ -914,6 +916,14 @@ public abstract class MainFrameMenu implements MenuBuilder {
             button.setSelected(Configuration.autoRenameIdentifiers.get());
         }
     }
+    
+    protected void autoDeobfuscateIdentifiersActionPerformed(ActionEvent evt) {
+        AbstractButton button = (AbstractButton) evt.getSource();
+        boolean selected = button.isSelected();
+
+        Configuration.autoDeobfuscateIdentifiers.set(selected);        
+        mainFrame.getPanel().autoDeobfuscateChanged();
+    }
 
     /*protected void cacheOnDiskActionPerformed(ActionEvent evt) {
      AbstractButton button = (AbstractButton) evt.getSource();
@@ -1385,7 +1395,8 @@ public abstract class MainFrameMenu implements MenuBuilder {
         addToggleMenuItem("/settings/disableDecompilation", translate("menu.settings.disabledecompilation"), null, null, this::disableDecompilationActionPerformed, 0, null);
         //addToggleMenuItem("/settings/cacheOnDisk", translate("menu.settings.cacheOnDisk"), null, null, this::cacheOnDiskActionPerformed, 0, null);
         addToggleMenuItem("/settings/gotoMainClassOnStartup", translate("menu.settings.gotoMainClassOnStartup"), null, null, this::gotoDocumentClassOnStartupActionPerformed, 0, null);
-        addToggleMenuItem("/settings/autoRenameIdentifiers", translate("menu.settings.autoRenameIdentifiers"), null, null, this::autoRenameIdentifiersActionPerformed, 0, null);
+        addToggleMenuItem("/settings/autoDeobfuscateIdentifiers", translate("menu.settings.autoDeobfuscateIdentifiers"), null, null, this::autoDeobfuscateIdentifiersActionPerformed, 0, null);
+        //addToggleMenuItem("/settings/autoRenameIdentifiers", translate("menu.settings.autoRenameIdentifiers"), null, null, this::autoRenameIdentifiersActionPerformed, 0, null);
         addToggleMenuItem("/settings/autoOpenLoadedSWFs", translate("menu.settings.autoOpenLoadedSWFs"), null, null, this::autoOpenLoadedSWFsActionPerformed, 0, null);
         addToggleMenuItem("/settings/flattenASPackages", translate("menu.settings.flattenASPackages"), null, null, this::flattenASPackagesActionPerformed, 0, null);
         if (Platform.isWindows()) {
@@ -1448,11 +1459,16 @@ public abstract class MainFrameMenu implements MenuBuilder {
             setMenuChecked("/settings/gotoMainClassOnStartup", newValue);
         });
 
-        setMenuChecked("/settings/autoRenameIdentifiers", Configuration.autoRenameIdentifiers.get());
+        /*setMenuChecked("/settings/autoRenameIdentifiers", Configuration.autoRenameIdentifiers.get());
         Configuration.autoRenameIdentifiers.addListener(configListenerAutoRenameIdentifiers = (Boolean newValue) -> {
             setMenuChecked("/settings/autoRenameIdentifiers", newValue);
+        });*/
+        
+        setMenuChecked("/settings/autoDeobfuscateIdentifiers", Configuration.autoDeobfuscateIdentifiers.get());
+        Configuration.autoDeobfuscateIdentifiers.addListener(configListenerAutoDeobfuscateIdentifiers = (Boolean newValue) -> {
+            setMenuChecked("/settings/autoDeobfuscateIdentifiers", newValue);
         });
-
+        
         setMenuChecked("/settings/autoOpenLoadedSWFs", Configuration.autoOpenLoadedSWFs.get());
         Configuration.autoOpenLoadedSWFs.addListener(configListenerAutoOpenLoadedSWFs = (Boolean newValue) -> {
             setMenuChecked("/settings/autoOpenLoadedSWFs", newValue);
@@ -1704,7 +1720,8 @@ public abstract class MainFrameMenu implements MenuBuilder {
         Configuration.decompile.removeListener(configListenerDecompile);
         //Configuration.cacheOnDisk.removeListener(configListenerCacheOnDisk);
         Configuration.gotoMainClassOnStartup.removeListener(configListenerGotoMainClassOnStartup);
-        Configuration.autoRenameIdentifiers.removeListener(configListenerAutoRenameIdentifiers);
+        //Configuration.autoRenameIdentifiers.removeListener(configListenerAutoRenameIdentifiers);
+        Configuration.autoDeobfuscateIdentifiers.removeListener(configListenerAutoDeobfuscateIdentifiers);
         Configuration.autoOpenLoadedSWFs.removeListener(configListenerAutoOpenLoadedSWFs);
 
         Main.stopRun();
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 35aebd9d6..b59bee0b0 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -1267,8 +1267,15 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
                 removeObfuscatedDeclarationsMenuItem.setSelected(Configuration.deobfuscateAs12RemoveInvalidNamesAssignments.get());
                 removeObfuscatedDeclarationsMenuItem.addActionListener(this::removeObfuscatedDeclarationsMenuItemActionPerformed);
                  */
+                
+                JCheckBoxMenuItem deobfuscateIdentifiersMenuItem = new JCheckBoxMenuItem(AppStrings.translate("deobfuscate_options.deobfuscateIdentifiers"));
+                deobfuscateIdentifiersMenuItem.setSelected(Configuration.autoDeobfuscateIdentifiers.get());
+                deobfuscateIdentifiersMenuItem.addActionListener(ABCPanel.this::autoDeobfuscateIdentifiersMenuItemActionPerformed);
+                
+                
                 popupMenu.add(simplifyExpressionsMenuItem);
                 //popupMenu.add(removeObfuscatedDeclarationsMenuItem);
+                popupMenu.add(deobfuscateIdentifiersMenuItem);
 
                 return popupMenu;
             }
@@ -2135,6 +2142,12 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
         Configuration.simplifyExpressions.set(menuItem.isSelected());
         mainPanel.autoDeobfuscateChanged();
     }
+    
+    private void autoDeobfuscateIdentifiersMenuItemActionPerformed(ActionEvent evt) {
+        JCheckBoxMenuItem menuItem = (JCheckBoxMenuItem) evt.getSource();
+        Configuration.autoDeobfuscateIdentifiers.set(menuItem.isSelected());
+        mainPanel.autoDeobfuscateChanged();
+    }
 
     /*private void removeObfuscatedDeclarationsMenuItemActionPerformed(ActionEvent evt) {
         JCheckBoxMenuItem menuItem = (JCheckBoxMenuItem) evt.getSource();
diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
index 767362235..a11b9cf3a 100644
--- a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
@@ -56,6 +56,7 @@ import com.jpexs.decompiler.flash.gui.SearchPanel;
 import com.jpexs.decompiler.flash.gui.TagEditorPanel;
 import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.decompiler.flash.gui.ViewMessages;
+import com.jpexs.decompiler.flash.gui.abc.ABCPanel;
 import com.jpexs.decompiler.flash.gui.controls.JPersistentSplitPane;
 import com.jpexs.decompiler.flash.gui.controls.NoneSelectedButtonGroup;
 import com.jpexs.decompiler.flash.gui.editor.DebuggableEditorPane;
@@ -99,6 +100,7 @@ import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -1023,10 +1025,14 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
                 JCheckBox skipUninitializedClassFieldsDetectionMenuItem = new JCheckBox(AppStrings.translate("deobfuscate_options.skip_uninitialized_class_fields_detection"));
                 skipUninitializedClassFieldsDetectionMenuItem.setSelected(Configuration.skipDetectionOfUnitializedClassFields.get());
                 skipUninitializedClassFieldsDetectionMenuItem.addActionListener(ActionPanel.this::skipUninitializedClassFieldsDetectionMenuItemActionPerformed);
+                JCheckBoxMenuItem deobfuscateIdentifiersMenuItem = new JCheckBoxMenuItem(AppStrings.translate("deobfuscate_options.deobfuscateIdentifiers"));
+                deobfuscateIdentifiersMenuItem.setSelected(Configuration.autoDeobfuscateIdentifiers.get());
+                deobfuscateIdentifiersMenuItem.addActionListener(ActionPanel.this::autoDeobfuscateIdentifiersMenuItemActionPerformed);
                 
                 popupMenu.add(simplifyExpressionsMenuItem);
                 popupMenu.add(removeObfuscatedDeclarationsMenuItem);
                 popupMenu.add(skipUninitializedClassFieldsDetectionMenuItem);
+                popupMenu.add(deobfuscateIdentifiersMenuItem);
 
                 return popupMenu;
             }
@@ -1176,6 +1182,12 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
         Configuration.skipDetectionOfUnitializedClassFields.set(checkBox.isSelected());
         mainPanel.skipDetectionOfUnitializedClassFieldsChanged();
     }
+    
+    private void autoDeobfuscateIdentifiersMenuItemActionPerformed(ActionEvent evt) {
+        JCheckBoxMenuItem menuItem = (JCheckBoxMenuItem) evt.getSource();
+        Configuration.autoDeobfuscateIdentifiers.set(menuItem.isSelected());
+        mainPanel.autoDeobfuscateChanged();
+    }
 
     private void breakPointListButtonActionPerformed(ActionEvent evt) {
         Main.showBreakpointsList();
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
index 1951804fd..b11cc977c 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
@@ -634,5 +634,5 @@ config.description.skipDetectionOfUnitializedClassFields = Skips detection of un
 config.name.showHeapStatusWidget = Show heap status widget
 config.description.showHeapStatusWidget = Displays used memory widget in the titlebar.
 
-config.name.useSafeStr = Use SafeStr notation
-config.description.useSafeStr = Obfuscated names that are not valid identifiers will be printed as _SafeStr_XX.
\ No newline at end of file
+config.name.autoDeobfuscateIdentifiers = Deobfuscate identifiers
+config.description.autoDeobfuscateIdentifiers = Obfuscated names that are not valid identifiers will be printed as _SafeStr_XX.
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties
index 5a539ff3b..0f804bc13 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties
@@ -632,4 +632,7 @@ config.name.skipDetectionOfUnitializedClassFields = AS2: P\u0159esko\u010dit det
 config.description.skipDetectionOfUnitializedClassFields = P\u0159esko\u010d\u00ed detekci neinicializovan\u00fdch atribut\u016f v AS2 t\u0159\u00edd\u00e1ch kter\u00e1 zahrnuje dekompilaci v\u0161ech skript\u016f v aktu\u00e1ln\u00edm SWF p\u0159ed p\u0159\u00edstupem k jak\u00e9koli t\u0159\u00edd\u011b. Nastavte toto na true pokud m\u00e1te velk\u00fd obfuskovan\u00fd soubor a chcete vid\u011bt alespo\u0148 n\u011bco (= nekompletn\u00ed t\u0159\u00eddu).
 
 config.name.showHeapStatusWidget = Zobrazit widget se stavem heapu
-config.description.showHeapStatusWidget = Zobraz\u00ed widget s pou\u017eitou pam\u011bt\u00ed v titulku okna.
\ No newline at end of file
+config.description.showHeapStatusWidget = Zobraz\u00ed widget s pou\u017eitou pam\u011bt\u00ed v titulku okna.
+
+config.name.autoDeobfuscateIdentifiers = Deobfuskovat idenfitik\u00e1tory
+config.description.autoDeobfuscateIdentifiers = Obfuskovan\u00e9 n\u00e1zvy kter\u00e9 nejsou platn\u00fdmi identifik\u00e1tory budou zobrazeny ve form\u00e1tu _SafeStr_XX.
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
index 73745376b..36c8bd5e3 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
@@ -1091,3 +1091,6 @@ work.decompiling.allScripts.ucf.canBeSkipped = You can turn off this step in the
 
 text.copy = Copy
 text.selectAll = Select all
+
+menu.settings.autoDeobfuscateIdentifiers = Deobfuscate identifiers
+deobfuscate_options.deobfuscateIdentifiers = Deobfuscate identifiers
\ No newline at end of file