diff --git a/archinstall/lib/args.py b/archinstall/lib/args.py
index 6d1e10a393..f7f0ee3ebd 100644
--- a/archinstall/lib/args.py
+++ b/archinstall/lib/args.py
@@ -500,7 +500,7 @@ def _process_creds_data(self, creds_data: str) -> dict[str, Any] | None:
 					decryption_pwd = get_password(
 						header=prompt,
 						allow_skip=False,
-						skip_confirmation=True,
+						no_confirmation=True,
 					)
 
 					if not decryption_pwd:
diff --git a/archinstall/lib/menu/util.py b/archinstall/lib/menu/util.py
index 78434ab592..d075ebb235 100644
--- a/archinstall/lib/menu/util.py
+++ b/archinstall/lib/menu/util.py
@@ -10,7 +10,7 @@ def get_password(
 	header: str | None = None,
 	allow_skip: bool = False,
 	preset: str | None = None,
-	skip_confirmation: bool = False,
+	no_confirmation: bool = False,
 ) -> Password | None:
 	while True:
 		result = Input(
@@ -35,7 +35,7 @@ def get_password(
 		password = Password(plaintext=result.get_value())
 		break
 
-	if skip_confirmation:
+	if no_confirmation:
 		return password
 
 	confirmation_header = f'{tr("Password")}: {password.hidden()}\n\n'
@@ -46,13 +46,16 @@ def _validate(value: str) -> str | None:
 			return tr('The password did not match, please try again')
 		return None
 
-	_ = Input(
+	result = Input(
 		header=confirmation_header,
-		allow_skip=False,
+		allow_skip=allow_skip,
 		password=True,
 		validator_callback=_validate,
 	).show()
 
+	if result.type_ == ResultType.Skip:
+		return None
+
 	return password
 
 
diff --git a/archinstall/lib/user/user_menu.py b/archinstall/lib/user/user_menu.py
index 3f50f517f7..3a13c592b5 100644
--- a/archinstall/lib/user/user_menu.py
+++ b/archinstall/lib/user/user_menu.py
@@ -45,7 +45,7 @@ def handle_action(self, action: str, entry: User | None, data: list[User]) -> li
 		elif action == self._actions[1] and entry:  # change password
 			header = f'{tr("User")}: {entry.username}\n'
 			header += tr('Enter new password')
-			new_password = get_password(header=header)
+			new_password = get_password(header=header, allow_skip=True)
 
 			if new_password:
 				user = next(filter(lambda x: x == entry, data))