diff -ruN dbmail-20030331/mysql/dbmysql.c dbmail-20030331-misc/mysql/dbmysql.c
--- dbmail-20030331/mysql/dbmysql.c	2003-03-18 02:42:49.000000000 -0700
+++ dbmail-20030331-misc/mysql/dbmysql.c	2003-03-31 10:20:51.000000000 -0700
@@ -1511,7 +1511,7 @@
   if (id)
     {
       /* this IP is already in the table, update the 'since' field */
-      snprintf(query, DEF_QUERYSIZE, "UPDATE pbsp SET since = unix_timestamp() WHERE idnr=%llu",id);
+      snprintf(query, DEF_QUERYSIZE, "UPDATE pbsp SET since = from_unixtime(unix_timestamp()) WHERE idnr=%llu",id);
 
       if (db_query(query) == -1)
 	{
@@ -1523,7 +1523,7 @@
   else
     {
       /* IP not in table, insert row */
-      snprintf(query, DEF_QUERYSIZE, "INSERT INTO pbsp (since, ipnumber) VALUES (unix_timestamp(),'%s')", ip);
+      snprintf(query, DEF_QUERYSIZE, "INSERT INTO pbsp (since, ipnumber) VALUES (from_unixtime(unix_timestamp()),'%s')", ip);
 
       if (db_query(query) == -1)
 	{
Binary files dbmail-20030331/mysql/libmysqldbmail.a and dbmail-20030331-misc/mysql/libmysqldbmail.a differ
diff -ruN dbmail-20030331/pop3.c dbmail-20030331-misc/pop3.c
--- dbmail-20030331/pop3.c	2003-03-17 09:04:08.000000000 -0700
+++ dbmail-20030331-misc/pop3.c	2003-03-31 10:20:27.000000000 -0700
@@ -381,7 +381,8 @@
 								 session->state = TRANSACTION;
 
 								 /* now we're going to build up a session for this user */
-								 trace(TRACE_DEBUG,"pop3(): validation ok, creating session");
+								 trace(TRACE_DEBUG,"pop3(): validation OK, building a session for user [%s]",
+					session->username);
 
 								 /* if pop_before_smtp is active, log this ip */
 								 if (pop_before_smtp)
@@ -695,14 +696,18 @@
 
 					default:
 							 {
+								 /* user logged in OK */
 								 session->state = TRANSACTION;
 								 
 								 /* user seems to be valid, let's build a session */
 								 trace(TRACE_DEBUG,"pop3(): validation OK, building a session for user [%s]",
 					session->username);
 								 
+								 /* if pop_before_smtp is active, log this ip */
+								 if (pop_before_smtp)
+									 db_log_ip(client_ip);
+
 								 result=db_createsession(result, session);
-								 
 								 if (result == 1)
 								 {
 									 fprintf((FILE *)stream, "+OK %s has %llu messages (%llu octets)\r\n",