diff -U 2 -r /root/src/webmin/vacationadm/index.cgi /usr/libexec/webmin/vacationadm/index.cgi
--- /root/src/webmin/vacationadm/index.cgi	Wed Dec 19 18:20:30 2001
+++ /usr/libexec/webmin/vacationadm/index.cgi	Wed Dec 19 19:19:40 2001
@@ -27,6 +27,5 @@
 
 # get some configuration options
-do '../web-lib.pl';
-&init_config();
+require './local-lib.pl';
 
 # force a fflush after each print/write command
@@ -61,4 +60,9 @@
 # Seems there are no errors, let's go on...
 #
+my $user=$ENV{REMOTE_USER};
+# Get the users home directory
+my $home=&get_home($user);
+my $vacmsgfile="$home/.vacation.msg";
+my $forwardfile="$home/.forward";
 
 print '<FORM METHOD="POST" ACTION="vacation.cgi">',"\n\n";
@@ -101,5 +105,5 @@
     print "          </td>\n";
     print "          <td $cb>\n";
-    print '            <INPUT TYPE=TEXT   NAME="user" SIZE=9 MAXLENGTH=256>',"\n";
+    print '            <INPUT TYPE=TEXT NAME="user" VALUE="',"$user",'" SIZE=9 MAXLENGTH=256>',"\n";
     print "          </td>\n";
     print "        </tr>\n";
@@ -120,4 +124,27 @@
 }
 
+# Read .forward file if it exist
+my $ONbutton="";
+my $OFFbutton="checked";
+my $ONbuttonfw="";
+my $OFFbuttonfw="checked";
+my @forwardlist=();
+if ( -f $forwardfile ) {
+  open(FORWARDFILE,"<$forwardfile");
+  my $firstline=<FORWARDFILE>;
+  if ( grep($config{'vacation_path'},$_) ne "" ) {
+    $ONbutton="checked";
+    $OFFbutton="";
+  }
+  while(<FORWARDFILE>) {
+    @forwardlist=(@forwardlist,$_);
+  }    
+  close(FORWARDFILE);
+  if (@forwardlist) {
+    $ONbuttonfw="checked";
+    $OFFbuttonfw="";
+  }
+}
+
 # The on/off radio button
 print "  <tr>\n";
@@ -138,5 +165,5 @@
 print "          <td>\n";
 print "            <center>\n";
-print '              <INPUT TYPE="radio" NAME="activate" VALUE="set" checked>';
+print '              <INPUT TYPE="radio" NAME="activate" VALUE="set" ',"$ONbutton",'>';
 print "              $text{'index_activate_seton'}\n";
 print "            </center>\n";
@@ -144,5 +171,5 @@
 print "          <td>\n";
 print "            <center>\n";
-print '              <INPUT TYPE="radio" NAME="activate" VALUE="unset">';
+print '              <INPUT TYPE="radio" NAME="activate" VALUE="unset"',"$OFFbutton",'>';
 print "              $text{'index_activate_setoff'}\n";
 print "            </center>\n";
@@ -170,7 +197,15 @@
 print "      <center>\n";
 print "        <TEXTAREA NAME=\"mess\" ROWS=\"8\" COLS=\"60\">\n";
-print "$text{'index_msg_default0'}\n\n";
-print "$text{'index_msg_default1'}\n";
-print "$text{'index_msg_default2'}";
+if ( -f $vacmsgfile ) {
+  open(VACMSGFILE,"<$vacmsgfile");
+  while(<VACMSGFILE>) {
+    print "$_";
+  }    
+  close(VACMSGFILE);
+} else {
+  print "$text{'index_msg_default0'}\n\n";
+  print "$text{'index_msg_default1'}\n";
+  print "$text{'index_msg_default2'}";
+}
 print         "</TEXTAREA>\n";
 print "      </center>\n";
@@ -242,5 +277,5 @@
 print "          <td>\n";
 print "            <center>\n";
-print '              <INPUT TYPE="radio" NAME="activate_fwd" VALUE="set">';
+print '              <INPUT TYPE="radio" NAME="activate_fwd" VALUE="set" ',"$ONbuttonfw",'>';
 print "              $text{'index_activate_fwd_yes'}\n";
 print "            </center>\n";
@@ -248,5 +283,5 @@
 print "          <td>\n";
 print "            <center>\n";
-print '              <INPUT TYPE="radio" NAME="activate_fwd" VALUE="unset" checked>';
+print '              <INPUT TYPE="radio" NAME="activate_fwd" VALUE="unset"',"$OFFbuttonfw",'>';
 print "              $text{'index_activate_fwd_no'}\n";
 print "            </center>\n";
@@ -273,5 +308,11 @@
 print "      <center>\n";
 print '        <TEXTAREA NAME="fwrd" ROWS="3" COLS="50">';
-print            "<$text{'index_forward_msg'}>";
+if (@forwardlist) {
+  foreach $fwdaddr (@forwardlist) {
+    print "$fwdaddr";
+  }
+} else {
+  print            "<$text{'index_forward_msg'}>";
+}
 print         "</TEXTAREA>\n";
 print "      </center>\n";
diff -U 2 -r /root/src/webmin/vacationadm/vacation.cgi /usr/libexec/webmin/vacationadm/vacation.cgi
--- /root/src/webmin/vacationadm/vacation.cgi	Wed Dec 19 18:12:20 2001
+++ /usr/libexec/webmin/vacationadm/vacation.cgi	Wed Dec 19 18:07:26 2001
@@ -29,5 +29,6 @@
 ###################################################################
 do '../web-lib.pl';
-do 'local-lib.pl';
+#do 'local-lib.pl';
+require './local-lib.pl';
 
 # We only need this module if we want ftp uploads
Only in /usr/libexec/webmin/vacationadm: vacation.db.slack