diff --git a/sections/user/edit.php b/sections/user/edit.php
index 41768bd5..5a2c0e8c 100644
--- a/sections/user/edit.php
+++ b/sections/user/edit.php
@@ -801,16 +801,16 @@ function checked($Checked) {
 					</div>
 					<div class="field_div">
 						<label>New password:<br />
-						<input type="password" size="40" name="new_pass_1" id="new_pass_1" value="" maxlength="40" /> <strong id="pass_strength"></strong></label>
+						<input type="password" size="40" name="new_pass_1" id="new_pass_1" value="" /> <strong id="pass_strength"></strong></label>
 					</div>
 					<div class="field_div">
 						<label>Confirm new password:<br />
-						<input type="password" size="40" name="new_pass_2" id="new_pass_2" value="" maxlength="40" /> <strong id="pass_match"></strong></label>
+						<input type="password" size="40" name="new_pass_2" id="new_pass_2" value="" /> <strong id="pass_match"></strong></label>
 					</div>
 					<div class="setting_description">
 						A strong password:
 						<ul>
-							<li>is between 8 and 40 characters long</li>
+							<li>is 8 characters or longer</li>
 							<li>contains at least 1 lowercase and uppercase letter</li>
 							<li>contains at least a number or symbol</li>
 						</ul>
diff --git a/sections/user/take_edit.php b/sections/user/take_edit.php
index b1925e31..86526d88 100644
--- a/sections/user/take_edit.php
+++ b/sections/user/take_edit.php
@@ -31,8 +31,7 @@
 $Val->SetFields('avatar', 0, "regex", "You did not enter a valid avatar URL.", array('regex' => "/^".IMAGE_REGEX."$/i"));
 $Val->SetFields('email', 1, "email", "You did not enter a valid email address.");
 $Val->SetFields('irckey', 0, "string", "You did not enter a valid IRC key. An IRC key must be between 6 and 32 characters long.", array('minlength' => 6, 'maxlength' => 32));
-$Val->SetFields('cur_pass', 0, "string", "You did not enter a valid password. Passwords must be at least 6 characters long.", array('minlength' => 6, 'maxlength' => 150));
-$Val->SetFields('new_pass_1', 0, "regex", "You did not enter a valid password. A strong password is between 8 and 40 characters long, contains at least 1 lowercase and uppercase letter, and contains at least a number or symbol.", array('regex' => '/(?=^.{8,}$)(?=.*[^a-zA-Z])(?=.*[A-Z])(?=.*[a-z]).*$/'));
+$Val->SetFields('new_pass_1', 0, "regex", "You did not enter a valid password. A strong password is 8 characters or longer, contains at least 1 lowercase and uppercase letter, and contains at least a number or symbol.", array('regex' => '/(?=^.{8,}$)(?=.*[^a-zA-Z])(?=.*[A-Z])(?=.*[a-z]).*$/'));
 $Val->SetFields('new_pass_2', 1, "compare", "Your passwords do not match.", array('comparefield' => 'new_pass_1'));
 if (check_perms('site_advanced_search')) {
 	$Val->SetFields('searchtype', 1, "number", "You forgot to select your default search preference.", array('minlength' => 0, 'maxlength' => 1));