diff --git a/html/inc/account.inc b/html/inc/account.inc
index d64bd55f9b..95a8563915 100644
--- a/html/inc/account.inc
+++ b/html/inc/account.inc
@@ -44,7 +44,7 @@ function toggle_passwd() {
     }
 }
 </script>
-<input type="checkbox" id="passwd_visible" onclick="toggle_passwd()"> <label for="passwd_visible><small>Show password</small></label>
+<input type="checkbox" id="passwd_visible" onclick="toggle_passwd()"> <label for="passwd_visible"><small>Show password</small></label>
         ', $name
     );
 }
@@ -95,7 +95,6 @@ function create_account_form($teamid, $next_url) {
         ),
         "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd")
     );
-    form_input_text(tra("Confirm password"), "passwd2", "", "password");
     form_select(
         sprintf('<span title="%s">%s</span>',
             tra("Select the country you want to represent, if any."),
diff --git a/html/inc/user_util.inc b/html/inc/user_util.inc
index ce24e2645c..4c2e1e99fc 100644
--- a/html/inc/user_util.inc
+++ b/html/inc/user_util.inc
@@ -175,10 +175,6 @@ function validate_post_make_user() {
     }
 
     $passwd = post_str("passwd");
-    $passwd2 = post_str("passwd2", true);
-    if ($passwd2 && ($passwd != $passwd2)) {
-        show_error(tra("New passwords are different"));
-    }
 
     $min_passwd_length = parse_config($config, "<min_passwd_length>");
     if (!$min_passwd_length) $min_passwd_length = 6;
diff --git a/html/user/edit_passwd_action.php b/html/user/edit_passwd_action.php
index f6ad3fa176..d0274d7b30 100644
--- a/html/user/edit_passwd_action.php
+++ b/html/user/edit_passwd_action.php
@@ -26,11 +26,6 @@ $user = get_logged_in_user();
 $email_addr = strtolower(post_str("email_addr", true));
 
 $passwd = post_str("passwd");
-$passwd2 = post_str("passwd2");
-
-if ($passwd != $passwd2) {
-    error_page(tra("New passwords are different"));
-}
 
 $config = get_config();
 $min_passwd_length = parse_config($config, "<min_passwd_length>");
diff --git a/html/user/edit_passwd_form.php b/html/user/edit_passwd_form.php
index 37d233d3c1..478ec110c8 100644
--- a/html/user/edit_passwd_form.php
+++ b/html/user/edit_passwd_form.php
@@ -26,8 +26,7 @@ $user = get_logged_in_user();
 page_head(tra("Change password"));
 
 form_start(secure_url_base()."edit_passwd_action.php", "post");
-form_input_text(tra("New password"), "passwd", "password",'id="passwd"',passwd_visible_checkbox("passwd"));
-form_input_text(tra("New password, again"), "passwd2", "password");
+form_input_text(tra("New password"), "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd"));
 form_submit(tra("Change password"));
 form_end();
 page_tail();