diff --git a/lib/ezid/client.rb b/lib/ezid/client.rb
index 5c44f76..175b219 100644
--- a/lib/ezid/client.rb
+++ b/lib/ezid/client.rb
@@ -59,8 +59,8 @@ def initialize(opts = {})
     end
 
     def inspect
-      "#<#{self.class.name} connection=#{connection.inspect} " \
-        "user=\"#{user}\" session=#{logged_in? ? 'OPEN' : 'CLOSED'}>"
+      "#<#{self.class.name} connection=#{connection.inspect}, " \
+        "user=#{user.inspect}, session=#{logged_in? ? 'OPEN' : 'CLOSED'}>"
     end
 
     # The client configuration
diff --git a/lib/ezid/configuration.rb b/lib/ezid/configuration.rb
index 461e3b7..dc585a1 100644
--- a/lib/ezid/configuration.rb
+++ b/lib/ezid/configuration.rb
@@ -49,6 +49,12 @@ def initialize
       @default_shoulder = ENV["EZID_DEFAULT_SHOULDER"]
     end
 
+    def inspect
+      ivars = instance_variables.reject { |v| v == :@password }
+                                .map { |v| "#{v}=#{instance_variable_get(v).inspect}" }
+      "#<#{self.class.name} #{ivars.join(', ')}>"
+    end
+
     def logger
       @logger ||= Logger.new(STDERR)
     end