diff --git a/FHEM/10_FS20.pm b/FHEM/10_FS20.pm
index fc4db6d53..5177ad805 100755
--- a/FHEM/10_FS20.pm
+++ b/FHEM/10_FS20.pm
@@ -184,7 +184,7 @@ FS20_Set($@)
   return "Readonly value $a[1]" if(defined($readonly{$a[1]}));
 
   if($na > 2 && $a[1] eq "dim") {
-    $a[1] = ($a[2] eq "0" ? "off" : "dim$a[2]%");
+    $a[1] = ($a[2] eq "0" ? "off" : sprintf("dim%02d%%",$a[2]) );
     splice @a, 2, 1;
     $na = int(@a);
   }
@@ -251,7 +251,8 @@ FS20_Set($@)
     my $to = sprintf("%02d:%02d:%02d", $val/3600, ($val%3600)/60, $val%60);
     $modules{FS20}{ldata}{$name} = $to;
     Log 4, "Follow: +$to setstate $name off";
-    CommandDefine(undef, $name . "_timer at +$to setstate $name off");
+    CommandDefine(undef,
+                $name."_timer at +$to setstate $name off; trigger $name off");
   }
 
   ##########################
diff --git a/docs/commandref.html b/docs/commandref.html
index 1af65ca9a..13f83777c 100644
--- a/docs/commandref.html
+++ b/docs/commandref.html
@@ -1535,10 +1535,6 @@ A line ending with \ will be concatenated with the next one, so long lines
       to 8 sec, 1 sec from 8 to 16 sec and so on. If you need better
           precision for large values, use <a href="#at">at</a> which has a 1
           sec resolution.</li>
-      <li>If the attribute follow-on-for-timer is set for the device and the
-          on-for-timer command is sent to the device with a time parameter,
-          the program automatically schedules a "setstate off" for the
-      specified time.</li>
       <li>on-till requires an absolute time in the "at" format (HH:MM:SS, HH:MM
       or { &lt;perl code&gt; }, where the perl-code returns a time
           specification).
@@ -1590,9 +1586,8 @@ A line ending with \ will be concatenated with the next one, so long lines
 
     <a name="follow-on-for-timer"></a>
     <li>follow-on-for-timer<br>
-    the program automatically schedules a "setstate off" for the time
-    specified as argument to the on-for-timer command (for the specified
-    device only).
+    schedule a "setstate off;trigger off" for the time specified as argument to
+    the on-for-timer command.
     </li><br>
 
     <li><a href="#loglevel">loglevel</a></li><br>