diff --git a/apps/emqx/src/emqx_access_control.erl b/apps/emqx/src/emqx_access_control.erl
index 37770e443..1b864cda9 100644
--- a/apps/emqx/src/emqx_access_control.erl
+++ b/apps/emqx/src/emqx_access_control.erl
@@ -34,7 +34,7 @@
     | {continue, binary(), map()}
     | {error, term()}.
 authenticate(Credential) ->
-    case emqx_hooks:run_fold('client.authenticate', [Credential], {ok, #{is_superuser => false}}) of
+    case run_hooks('client.authenticate', [Credential], {ok, #{is_superuser => false}}) of
         ok ->
             {ok, #{is_superuser => false}};
         Other ->
diff --git a/apps/emqx/src/emqx_authentication.erl b/apps/emqx/src/emqx_authentication.erl
index e6caf9b26..4cf2c99cd 100644
--- a/apps/emqx/src/emqx_authentication.erl
+++ b/apps/emqx/src/emqx_authentication.erl
@@ -909,12 +909,8 @@ to_list(L) when is_list(L) -> L.
 
 call(Call) -> gen_server:call(?MODULE, Call, infinity).
 
-inc_authenticate_metric(Metric) ->
-    emqx_metrics:inc('client.authenticate'),
-    inc_authenticate_metric2(Metric).
-
-inc_authenticate_metric2('authentication.success.anonymous' = Metric) ->
+inc_authenticate_metric('authentication.success.anonymous' = Metric) ->
     emqx_metrics:inc(Metric),
     emqx_metrics:inc('authentication.success');
-inc_authenticate_metric2(Metric) ->
+inc_authenticate_metric(Metric) ->
     emqx_metrics:inc(Metric).