diff '--color=auto' -rupN adduser-debian-3.137.orig/adduser adduser-debian-3.137/adduser
--- adduser-debian-3.137.orig/adduser	2023-07-02 10:45:48.007039732 +0930
+++ adduser-debian-3.137/adduser	2023-07-02 10:46:01.457448798 +0930
@@ -1296,16 +1296,14 @@ sub ch_comment {
     my $chfn = &which('chfn');
     my $comment = shift;
     if($comment =~ /,/) {
-        my($comment_name,$comment_room,$comment_work,$comment_home,$comment_other)
+        my($comment_name,$comment_room,$comment_work,$comment_home)
           = split(/,/,$comment);
  
-        &systemcall($chfn, '-f', $comment_name, '-r', $comment_room, $new_name);
-        &systemcall($chfn,'-w',$comment_work,$new_name)
+        &systemcall($chfn, '-f', $comment_name, '-o', $comment_room, $new_name);
+        &systemcall($chfn,'-p',$comment_work,$new_name)
           if(defined($comment_work));
         &systemcall($chfn,'-h',$comment_home,$new_name)
           if(defined($comment_home));
-        &systemcall($chfn,'-o',$comment_other,$new_name)
-          if(defined($comment_other));
     } else {
         &systemcall($chfn, '-f', $comment, $new_name);
     }