diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index b77624dff39..6f1749b92b3 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -303,6 +303,7 @@ class FormActions
 						$tmpb = dol_getdate($actioncomm->datef);
 						if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
 							// The same day
+							print '<div class="center inline-block dateheight">';
 							if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes']) {
 								print dol_print_date($actioncomm->datep, 'dayreduceformat', 'tzuserrel');
 								print '<br><span class="small opacitymedium">';
@@ -315,6 +316,7 @@ class FormActions
 								print dol_print_date($actioncomm->datep, 'hourreduceformat', 'tzuserrel');
 								print '</span>';
 							}
+							print '</div>';
 						} else {
 							// Not the same day
 							print '<div class="center inline-block">';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 85aa11038c2..10b23c2660e 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -654,6 +654,10 @@ span.userimg.notfirst, div.userimg.notfirst {
 div.userimg.notfirst {
 	display: block-inline;
 }
+.center.inline-block.dateheight {
+	line-height: 1.2em;
+}
+
 
 /* Used by timesheets */
 span.timesheetalreadyrecorded input {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 73cb995a2ae..76234b7ac06 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -832,6 +832,9 @@ span.userimg.notfirst, div.userimg.notfirst {
 div.userimg.notfirst {
 	display: block-inline;
 }
+.center.inline-block.dateheight {
+	line-height: 1.2em;
+}
 
 /* Used by timesheets */
 span.timesheetalreadyrecorded input {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index a3c307bc880..738ad7eb7ee 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2103,7 +2103,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 					print $langs->trans("APIKeys");
 					print '</a>';*/
 					print '<div class="left inline-block">';
-					$s = '<!-- MAIN_SECURITY_ALLOW_TOTP --><span class="fa fa-pen valignmiddle btnTitle-icon"></span>';
+					$s = '<!-- API_IN_TOKEN_TABLE --><span class="fa fa-pen valignmiddle btnTitle-icon"></span>';
 					print dolButtonToOpenUrlInDialogPopup('openpopuptoaddapitoken', $langs->transnoentitiesnoconv("APIKeys"), $s, '/user/api_token/list.php?id='.$object->id.'&token='.newToken());
 					print '</div>';
 					print '</div>';
@@ -2113,7 +2113,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 						print showValueWithClipboardCPButton($object->api_key, 1, $langs->transnoentities("Hidden"));		// TODO Add an option to also reveal the hash, not only copy paste
 						print '</span>';
 					}
-					if (getDolGlobalString('API_ENABLE_COUNT_CALLS') || !empty($dolibarr_api_count_always_enabled)) {
+					if ($object->api_key && (getDolGlobalString('API_ENABLE_COUNT_CALLS') || !empty($dolibarr_api_count_always_enabled))) {
 						print ' &nbsp; <span class="badge badge-info" title="'.$langs->trans("TotalAPICall").'">';
 						print getDolUserInt('API_COUNT_CALL');
 						print '</span>';