diff --git a/src/cockpit/389-console/src/lib/database/globalPwp.jsx b/src/cockpit/389-console/src/lib/database/globalPwp.jsx
index 743335721..7429806d0 100644
--- a/src/cockpit/389-console/src/lib/database/globalPwp.jsx
+++ b/src/cockpit/389-console/src/lib/database/globalPwp.jsx
@@ -246,6 +246,12 @@ export class GlobalPwPolicy extends React.Component {
         if (!this.state.savePasswordStorageDisabled) {
             this.handleSavePasswordStorage();
         }
+        if (this.state.saveGeneralDisabled) {
+            this.setState({
+                saving: false
+            });
+            return;
+        }
 
         const cmd = [
             'dsconf', '-j', "ldapi://%2fvar%2frun%2fslapd-" + this.props.serverId + ".socket",
diff --git a/src/lib389/lib389/cli_conf/plugins/pwstorage.py b/src/lib389/lib389/cli_conf/plugins/pwstorage.py
index e2b2ccbe3..2ec66b795 100644
--- a/src/lib389/lib389/cli_conf/plugins/pwstorage.py
+++ b/src/lib389/lib389/cli_conf/plugins/pwstorage.py
@@ -34,7 +34,7 @@ def pbkdf2_get_iterations(inst, basedn, log, args):
     log = log.getChild('pbkdf2_get_iterations')
     plugin = _get_pbkdf2_plugin(inst, args.variant)
     
-    attr = 'nsslapd-pwdPBKDF2NumIterations'
+    attr = 'nsslapd-pwdpbkdf2numiterations'
     
     if hasattr(args, 'json') and args.json:
         vals = {}