--- a/branches/2.5.4RC1/cgi-bin/yabb2/Sources/Subs.pm
+++ b/branches/2.5.4RC1/cgi-bin/yabb2/Sources/Subs.pm
@@ -19,7 +19,7 @@
 use English qw(-no_match_vars);
 our $VERSION = '2.5.41';
 
-$subspmver = 'YaBB 2.5.4 RC1 $Revision: 1406 $';
+$subspmver = 'YaBB 2.5.4 RC1 $Revision: 1412 $';
 
 if ($debug) { LoadLanguage('Debug'); }
 
@@ -926,10 +926,16 @@
         $FORM{$formdata} =~ s/\n//igsm;
     }
 
-    if ($iamguest) {
+    if ($iamguest && !$iambot) {
         push @errorlog,
           int(time)
           . "|$date|$user_ip|$tmperror|$action|$INFO{'num'}|$currentboard|$FORM{'username'}|$FORM{'passwrd'}\n";
+    }
+    elsif ($iambot) {
+	    my $is_a_bot = Is_Bot($last_host);
+        push @errorlog,
+          int(time)
+          . "|$date|$user_ip|$tmperror|$action|$INFO{'num'}|$currentboard|$is_a_bot|$FORM{'passwrd'}\n";
     }
     else {
         push @errorlog,