diff --git a/modules/user.module b/modules/user.module
index ce884d8f3f1..dae776143f3 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -562,6 +562,7 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
           );
           $form['pass'] = array('#type' => 'password',
             '#title' => t('Password'),
+            '#maxlength' => 60,
             '#size' => 15,
             '#required' => TRUE,
           );