diff --git a/mozilla/suite/common/pref/pref-advanced.xul b/mozilla/suite/common/pref/pref-advanced.xul
index d7821adc565..ca639bcf289 100644
--- a/mozilla/suite/common/pref/pref-advanced.xul
+++ b/mozilla/suite/common/pref/pref-advanced.xul
@@ -86,6 +86,19 @@
 					&sendAddFtpCheck.label;
 				</html:label>
 			</html:div>
+			<html:div>
+			<html:input type="checkbox" id="pref:0:bool:signon.rememberSignons" />
+				<html:label for="pref:0:bool:signon.rememberSignons" accesskey="r" tabindex="0">
+					&remSignCheck.label; 
+				</html:label>
+			</html:div>
+			<html:div>
+			<html:input type="checkbox" checked="true" id="pref:0:bool:wallet.captureForms" />
+				<html:label for="pref:0:bool:wallet.captureForms" accesskey="c" tabindex="0">
+					&capFormsCheck.label;
+				</html:label>
+			</html:div>
+
 				
 	</html:fieldset>
 	</box>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/PrefsWindow.xul b/mozilla/xpfe/components/prefwindow/resources/content/PrefsWindow.xul
index 5f698b9e64d..3b7949ca346 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/PrefsWindow.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/PrefsWindow.xul
@@ -41,9 +41,9 @@
 	<html:tr>
 		<html:td valign="right" width="200">
 			<html:center>					
-				<html:input type="button" align="bottom" value="&helpButton.label;" />				
-				<html:input type="button" align="bottom" value="&cancelButton.label;" onclick="prefwindow.cancelPrefs();" />				
-				<html:input type="button" align="bottom" value="&okButton.label;" onclick="prefwindow.savePrefs();" />
+				<titledbutton align="bottom" value="&helpButton.label;" />				
+				<titledbutton align="bottom" value="&cancelButton.label;" onclick="prefwindow.cancelPrefs();" />				
+				<titledbutton align="bottom" value="&okButton.label;" onclick="prefwindow.savePrefs();" />
 			 </html:center>	  
 		  </html:td>
 	  </html:tr>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
index d7821adc565..ca639bcf289 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -86,6 +86,19 @@
 					&sendAddFtpCheck.label;
 				</html:label>
 			</html:div>
+			<html:div>
+			<html:input type="checkbox" id="pref:0:bool:signon.rememberSignons" />
+				<html:label for="pref:0:bool:signon.rememberSignons" accesskey="r" tabindex="0">
+					&remSignCheck.label; 
+				</html:label>
+			</html:div>
+			<html:div>
+			<html:input type="checkbox" checked="true" id="pref:0:bool:wallet.captureForms" />
+				<html:label for="pref:0:bool:wallet.captureForms" accesskey="c" tabindex="0">
+					&capFormsCheck.label;
+				</html:label>
+			</html:div>
+
 				
 	</html:fieldset>
 	</box>