diff --git a/run-integration-tests.sh b/run-integration-tests.sh
index 00cbaaaff..579a7b662 100755
--- a/run-integration-tests.sh
+++ b/run-integration-tests.sh
@@ -27,7 +27,7 @@ toxargs="$@"
 if [ -e liveconfig ]; then
     toxargs="--liveconfig liveconfig $@"
 fi
-tox -- $toxargs
+tox $toxargs
 ret=$?
 popd
 exit $ret
diff --git a/src/dc_configure.rs b/src/dc_configure.rs
index e93a33b3c..1ec517cde 100644
--- a/src/dc_configure.rs
+++ b/src/dc_configure.rs
@@ -10,6 +10,7 @@ use crate::dc_strencode::*;
 use crate::dc_tools::*;
 use crate::imap::*;
 use crate::oauth2::*;
+use crate::types::*;
 use crate::x::*;
 
 /* ******************************************************************************
diff --git a/src/imap.rs b/src/imap.rs
index 43696b2ee..31c22fb14 100644
--- a/src/imap.rs
+++ b/src/imap.rs
@@ -554,6 +554,9 @@ impl Imap {
                         s
                     });
 
+                    log_event!(context, Event::IMAP_CONNECTED, 
+                        0, "IMAP-LOGIN as {} ok", as_str(lp.mail_user),
+                    );
                     info!(context, 0, "IMAP-capabilities:{}", caps_list);
 
                     let mut config = self.config.write().unwrap();
diff --git a/src/smtp.rs b/src/smtp.rs
index cc34fd34e..0e2a4ac70 100644
--- a/src/smtp.rs
+++ b/src/smtp.rs
@@ -138,15 +138,9 @@ impl Smtp {
                     .credentials(creds)
                     .connection_reuse(lettre::smtp::ConnectionReuseParameters::ReuseUnlimited);
                 self.transport = Some(client.transport());
-                unsafe {
-                    dc_log_event(
-                        context,
-                        Event::SMTP_CONNECTED,
-                        0,
-                        b"SMTP-LOGIN ok" as *const u8
-                            as *const libc::c_char,
-                    );
-                }
+                log_event!(context, Event::SMTP_CONNECTED,
+                    0, "SMTP-LOGIN as {} ok", as_str(lp.send_user),
+                );
                 1
             }
             Err(err) => {