diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php
index 221ef5c71..0b69a4a69 100644
--- a/data/web/inc/functions.inc.php
+++ b/data/web/inc/functions.inc.php
@@ -2378,8 +2378,8 @@ function identity_provider($_action, $_data = null, $_extra = null) {
         clear_session();  
         $_SESSION['return'][] =  array(
           'type' => 'danger',
-          'log' => array(__FUNCTION__, $_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role']),
-          'msg' => 'login_failed'
+          'log' => array(__FUNCTION__, $info['email']),
+          'msg' => array('login_failed', 'empty attribute mapping or missing template attribute')
         );
         return false;
       }
@@ -2390,8 +2390,8 @@ function identity_provider($_action, $_data = null, $_extra = null) {
         clear_session();  
         $_SESSION['return'][] =  array(
           'type' => 'danger',
-          'log' => array(__FUNCTION__, $_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role']),
-          'msg' => 'login_failed'
+          'log' => array(__FUNCTION__, $info['email']),
+          'msg' => array('login_failed', 'specified template not found')
         );
         return false;
       }
@@ -2407,8 +2407,8 @@ function identity_provider($_action, $_data = null, $_extra = null) {
         clear_session();  
         $_SESSION['return'][] =  array(
           'type' => 'danger',
-          'log' => array(__FUNCTION__, $_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role']),
-          'msg' => 'login_failed'
+          'log' => array(__FUNCTION__, $info['email']),
+          'msg' => array('login_failed', 'mailbox creation failed')
         );
         return false;
       }