diff --git a/lib/CF/Controller/Users.pm b/lib/CF/Controller/Users.pm
index fae7b064775519b3f69317d2eb49f01b91606a6c..957b1183661b6ffee625170e878c6ff8fc2f3f1f 100644
--- a/lib/CF/Controller/Users.pm
+++ b/lib/CF/Controller/Users.pm
@@ -11,15 +11,16 @@ sub me ($c){
     my $formatted = $user->formatted;
 
     if (
-        ( $user->jitsi_allowed || $user->roles =~ /chairman/ )
+        ( $user->jitsi_allowed || $user->roles =~ /chairman|jitsi/ )
         && $c->cfg->{jitsi_base_url}
         && $c->cfg->{jitsi_room}
     ) {
-        $formatted->{jitsi_url} = join ('',
-            $c->cfg->{jitsi_base_url},
+        $formatted->{jitsi_url} = $c->jitsi_url(
             $c->cfg->{jitsi_room},
-            '?jwt=',
-            $c->jitsi_token($c->cfg->{jitsi_room}),
+            $c->cfg->{jitsi_token_lifetime},
+            $user->get_columns,
+            moderator => $user->roles =~ /chairman/,
+            email     => $c->oauth_claims->{mail},
         );
     }