--- a/browser/components/preferences/security.xul
+++ b/browser/components/preferences/security.xul
@@ -138,21 +138,21 @@
                   onsyncfrompreference="return gSecurityPane.readSavePasswords();"/>
         <button id="passwordExceptions"
                 label="&passwordExceptions.label;"
                 accesskey="&passwordExceptions.accesskey;"
                 oncommand="gSecurityPane.showPasswordExceptions();"
                 preference="pref.privacy.disable_button.view_passwords_exceptions"/>
       </hbox>
       <hbox id="masterPasswordBox">
-        <checkbox id="useMasterPassword" flex="1"
+        <checkbox id="useMasterPassword" flex="1" disabled="true"
                   oncommand="gSecurityPane.updateMasterPasswordButton();"
                   label="&useMasterPassword.label;"
                   accesskey="&useMasterPassword.accesskey;"/>
-        <button id="changeMasterPassword"
+        <button id="changeMasterPassword" disabled="true"
                 label="&changeMasterPassword.label;"
                 accesskey="&changeMasterPassword.accesskey;"
                 oncommand="gSecurityPane.changeMasterPassword();"/>
       </hbox>
 
       <hbox id="showPasswordsBox">
         <spacer flex="1"/>
         <button id="showPasswords"

--- a/toolkit/mozapps/preferences/changemp.xul
+++ b/toolkit/mozapps/preferences/changemp.xul
@@ -75,22 +75,22 @@
                 than one tokens, some initialized and some not - does not work properly. So, 
                 either the textbox 'oldpw' or the textbox 'message' would be displayed, 
                 depending on the state of the token selected 
           -->
           <textbox id="message" disabled="true" />
         </row>
         <row>
           <label control="pw1" value="&setPassword.newPassword.label;"/> 
-          <textbox id="pw1" type="password" 
+          <textbox id="pw1" type="password" disabled="true"
                    oninput="setPasswordStrength(); checkPasswords();"/> 
         </row>
         <row>
           <label control="pw2" value="&setPassword.reenterPassword.label;"/> 
-          <textbox id="pw2" type="password" oninput="checkPasswords();"/>  
+          <textbox id="pw2" type="password" disabled="true" oninput="checkPasswords();"/>  
         </row>
       </rows>
     </grid>
   </groupbox>
 
   <groupbox>
     <caption label="&setPassword.meter.label;"/>
     <progressmeter id="pwmeter" mode="determined" value="0"/>

--- a/toolkit/mozapps/preferences/removemp.xul
+++ b/toolkit/mozapps/preferences/removemp.xul
@@ -29,17 +29,17 @@
   
   <separator class="thin"/>
     
   <groupbox>
     <caption label="&removeInfo.label;"/>
 
     <hbox align="center">
       <label control="password" value="&setPassword.oldPassword.label;"/> 
-      <textbox id="password" type="password"
+      <textbox id="password" type="password" disabled="true"
                oninput="gRemovePasswordDialog.validateInput();"
                xhtml2:role="textfield" aaa:describedby="warnings"/>
     </hbox>
   </groupbox>
   
   <separator/>
 
 </dialog>