diff --git a/lib/oxidized/model/procurve.rb b/lib/oxidized/model/procurve.rb
index a1d80fddf..ba50d821d 100644
--- a/lib/oxidized/model/procurve.rb
+++ b/lib/oxidized/model/procurve.rb
@@ -44,10 +44,11 @@ class Procurve < Oxidized::Model
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community) \S+(.*)/, '\\1 <secret hidden> \\2'
     cfg.gsub! /^(snmp-server host \S+) \S+(.*)/, '\\1 <secret hidden> \\2'
-    cfg.gsub! /^(radius-server host \S+ key) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(radius-server host \S+ (?:key|encrypted-key)) \S+$/, '\\1 <secret hidden>'
     cfg.gsub! /^(radius-server key).*/, '\\1 <configuration removed>'
     cfg.gsub! /^(tacacs-server host \S+ key) \S+(.*)/, '\\1 <secret hidden> \\2'
     cfg.gsub! /^(tacacs-server key).*/, '\\1 <secret hidden>'
+    cfg.gsub! /(encrypt-cred) \S+(.*)/, '\\1 <secret hidden>'
     cfg
   end