diff --git a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
index 55bce70de5b7..746fa11dc405 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
+++ b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
@@ -441,14 +441,14 @@ f_dialog_input_class()
 	return $SUCCESS
 }
 
-# f_dialog_input_change [$seconds]
+# f_dialog_input_expire_password [$seconds]
 #
 # Allow the user to enter a date/time (in number-of-seconds since the `epoch')
 # for when a given user's password must be changed. If the user does not cancel
 # or press ESC, the $pw_password_expire variable will hold the newly-
 # configured value upon return.
 #
-f_dialog_input_change()
+f_dialog_input_expire_password()
 {
 	local prompt="$msg_password_expires_on"
 	local menu_list="
@@ -622,14 +622,14 @@ f_dialog_input_change()
 	return $SUCCESS
 }
 
-# f_dialog_input_expire [$seconds]
+# f_dialog_input_expire_account [$seconds]
 #
 # Allow the user to enter a date/time (in number-of-seconds since the `epoch')
 # for when a given user's account should become expired. If the user does not
 # cancel or press ESC, the $pw_account_expire variable will hold the newly-
 # configured value upon return.
 #
-f_dialog_input_expire()
+f_dialog_input_expire_account()
 {
 	local prompt="$msg_account_expires_on"
 	local menu_list="
diff --git a/usr.sbin/bsdconfig/usermgmt/userinput b/usr.sbin/bsdconfig/usermgmt/userinput
index df79ac583368..3df184ce0bf4 100755
--- a/usr.sbin/bsdconfig/usermgmt/userinput
+++ b/usr.sbin/bsdconfig/usermgmt/userinput
@@ -254,8 +254,8 @@ if [ "$mode" = "Add" ]; then
 	f_dialog_input_gid || exit 0
 	f_dialog_input_member_groups || exit 0
 	f_dialog_input_class || exit 0
-	f_dialog_input_change || exit 0
-	f_dialog_input_expire || exit 0
+	f_dialog_input_expire_password || exit 0
+	f_dialog_input_expire_account || exit 0
 	f_dialog_input_home_dir "$homeprefix/$pw_name" || exit 0
 	pw_dotfiles_create="$msg_no"
 	if [ ! -d "$homeprefix/$pw_name" ]; then
@@ -472,10 +472,10 @@ while :; do
 	   f_dialog_input_class "$pw_class"
 	   ;;
 	8) # Password Expire on
-	   f_dialog_input_change "$pw_password_expire"
+	   f_dialog_input_expire_password "$pw_password_expire"
 	   ;;
 	9) # Account Expire on
-	   f_dialog_input_expire "$pw_account_expire"
+	   f_dialog_input_expire_account "$pw_account_expire"
 	   ;;
 	A) # Home Directory
 	   f_dialog_input_home_dir "$pw_home_dir"