Index: src/orca/default.py
===================================================================
--- src/orca/default.py	(revision 2308)
+++ src/orca/default.py	(working copy)
@@ -2625,9 +2625,11 @@
             if (text == " " and keyString == "space") \
                 or (text == keyString):
                 pass
-            elif wasCommand or wasAutoComplete or \
-                   (event.source.role == rolenames.ROLE_PASSWORD_TEXT):
+            elif wasCommand or wasAutoComplete:
                 speakThis = True
+            elif (event.source.role == rolenames.ROLE_PASSWORD_TEXT) and \
+                 settings.enableKeyEcho:
+                speakThis = True
 
         elif isinstance(orca_state.lastInputEvent, \
                         input_event.MouseButtonEvent) and \