diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
index 6dae940136..4476895d88 100644
--- a/src/wp-admin/user-edit.php
+++ b/src/wp-admin/user-edit.php
@@ -481,10 +481,12 @@ if ( $show_password_fields ) :
 	</td>
 </tr>
 <tr class="pw-weak">
-	<th><label for="pw-weak"><?php _e( 'Confirm Password' ); ?></label></th>
+	<th><?php _e( 'Confirm Password' ); ?></th>
 	<td>
-	<input type="checkbox" name="pw-weak" class="pw-checkbox" />
-	<?php _e( 'Confirm use of weak password' ); ?>
+		<label for="pw-weak">
+			<input type="checkbox" name="pw-weak" class="pw-checkbox" id="pw-weak" />
+			<?php _e( 'Confirm use of weak password' ); ?>
+		</label>
 	</td>
 </tr>
 <?php endif; ?>
diff --git a/src/wp-admin/user-new.php b/src/wp-admin/user-new.php
index a5b0824b95..47e3b6c0a2 100644
--- a/src/wp-admin/user-new.php
+++ b/src/wp-admin/user-new.php
@@ -419,10 +419,12 @@ if ( apply_filters( 'show_password_fields', true ) ) : ?>
 		</td>
 	</tr>
 	<tr class="pw-weak">
-		<th><label for="pw-weak"><?php _e( 'Confirm Password' ); ?></label></th>
+		<th><?php _e( 'Confirm Password' ); ?></th>
 		<td>
-			<input type="checkbox" name="pw-weak" class="pw-checkbox" />
-			<?php _e( 'Confirm use of weak password' ); ?>
+			<label for="pw-weak">
+				<input type="checkbox" name="pw-weak" class="pw-checkbox" id="pw-weak" />
+				<?php _e( 'Confirm use of weak password' ); ?>
+			</label>
 		</td>
 	</tr>
 <?php endif; ?>