--- a/security/manager/pki/resources/content/changepassword.xul
+++ b/security/manager/pki/resources/content/changepassword.xul
@@ -21,44 +21,38 @@
 
 <hbox align="center">
   <label value="&setPassword.tokenName.label;: "/>
   <label id="tokenName" />
 </hbox>
 
 <separator/>
 
-<grid>
- <columns>
-   <column/>
-   <column/> 
- </columns>
- <rows>
-   <row>
-     <label value="&setPassword.oldPassword.label;"/> 
-     <textbox id="oldpw" type="password"/>
-     <!-- This textbox is inserted as a workaround to the fact that making the 'type' 
-          & 'disabled' property of the 'oldpw' textbox toggle between ['password' & 
-          'false'] and ['text' & 'true'] - as would be necessary if the menu has more 
-          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 
+<vbox>
+  <hbox>
+    <label flex="1" value="&setPassword.oldPassword.label;"/>
+    <textbox id="oldpw" type="password"/>
+    <!-- This textbox is inserted as a workaround to the fact that making the 'type'
+         & 'disabled' property of the 'oldpw' textbox toggle between ['password' &
+         'false'] and ['text' & 'true'] - as would be necessary if the menu has more
+         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 value="&setPassword.newPassword.label;"/> 
-     <textbox id="pw1" type="password" 
-       oninput="setPasswordStrength(); checkPasswords();"/> 
-   </row>
-   <row>
-     <label value="&setPassword.reenterPassword.label;"/> 
-     <textbox id="pw2" type="password" oninput="checkPasswords();"/>  
-   </row>
- </rows>
-</grid>
+   </hbox>
+  <hbox>
+    <label flex="1" value="&setPassword.newPassword.label;"/>
+    <textbox id="pw1" type="password"
+             oninput="setPasswordStrength(); checkPasswords();"/>
+  </hbox>
+  <hbox>
+    <label flex="1" value="&setPassword.reenterPassword.label;"/>
+    <textbox id="pw2" type="password" oninput="checkPasswords();"/>
+  </hbox>
+</vbox>
 
 <vbox style="margin: 6px;">
   <html:label for="pwmeter" style="display: -moz-box;">&setPassword.meter.label;</html:label>
   <html:progress id="pwmeter" value="0" max="100"/>
 </vbox>
 
 </dialog>