From 6e6c9c26c77eed69c9d4ffde2f4ae35e9243806d Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 27 Jan 2025 21:55:06 -0800
Subject: [PATCH] Logic cleanup

---
 useradmin/edit_user.cgi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/useradmin/edit_user.cgi b/useradmin/edit_user.cgi
index e0f5020ec..d2405915b 100755
--- a/useradmin/edit_user.cgi
+++ b/useradmin/edit_user.cgi
@@ -195,11 +195,10 @@ if (&supports_temporary_disable()) {
 	}
 
 # Show password field
-$passmode = $pass eq "" && $random_password eq "" ? 0 :
-	    $pass eq $config{'lock_string'} && $random_password eq "" ? 1 :
-	    $random_password ne "" ? 3 :
-	    $pass && $pass ne $config{'lock_string'} &&
-		$random_password eq "" ? 2 : -1;
+$passmode = $random_password ne "" ? 3 :
+	    $pass eq "" ? 0 :
+	    $pass eq $config{'lock_string'} ? 1 :
+	    $pass && $pass ne $config{'lock_string'} ? 2 : -1;
 $pffunc = $config{'passwd_stars'} ? \&ui_password : \&ui_textbox;
 my @modes;
 if ($passmode eq '0' || $config{'empty_mode'}) {