diff --git a/src/mod_offline.erl b/src/mod_offline.erl
index 516b3ba4a..a624de363 100644
--- a/src/mod_offline.erl
+++ b/src/mod_offline.erl
@@ -1002,7 +1002,9 @@ get_queue_length(LUser, LServer) ->
     count_offline_messages(LUser, LServer).
 
 webadmin_user(Acc, User, Server, R) ->
-    Acc ++ [make_command(get_offline_count, R, [{<<"user">>, User}, {<<"host">>, Server}], [])].
+    Acc ++ [make_command(get_offline_count, R, [{<<"user">>, User}, {<<"host">>, Server}],
+                         [{result_links, [{value, arg_host, 4, <<"user/", User/binary, "/queue/">>}]}]
+                        )].
 
 %%%
 %%%
diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 902986943..f093e118f 100644
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -1096,7 +1096,11 @@ make_webadmin_roster_table(Host, Username, R, RPath) ->
 
 webadmin_user(Acc, User, Server, R) ->
     Acc
-    ++ [make_command(get_roster_count, R, [{<<"user">>, User}, {<<"host">>, Server}], [])].
+    ++ [make_command(get_roster_count,
+                     R,
+                     [{<<"user">>, User}, {<<"host">>, Server}],
+                     [{result_links,
+                       [{value, arg_host, 4, <<"user/", User/binary, "/roster/">>}]}])].
 %%% @format-end
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%