Merge: rev820 (fix form input widths on the account page)