diff --git a/lib/CF/Helpers/Auth.pm b/lib/CF/Helpers/Auth.pm
index 7417dd7d973ae6d7bf192c33a3a5146f8efd4d09..866ceb2f0a86a75af19676c79ffc0e52a6b1e8ea 100644
--- a/lib/CF/Helpers/Auth.pm
+++ b/lib/CF/Helpers/Auth.pm
@@ -81,6 +81,7 @@ sub register ( $class, $self, $conf) {
                 uuid     => $claims->{sub},
                 username => $claims->{preferred_username},
                 name     => $claims->{name},
+                groups   => $claims->{groups},
                 main_group_name => $c->oauth_main_group_name(),
             };
         }
@@ -94,19 +95,7 @@ sub register ( $class, $self, $conf) {
             @roles = split /\W+/, $c->req->headers('X-Roles');
         }
         elsif ( my $claims = $c->oauth_claims ) {
-
-            if ( $c->cfg->{groups_to_roles_map} ) {
-                GROUP:
-                foreach my $group ( sort @{ $claims->{groups} } ) {
-                    if ($c->cfg->{groups_to_roles_map} =~ /$group=(\w+)/x) {
-                        push @roles, $1;
-                    }
-                }
-            }
-            else {
-                @roles = @{ $claims->{roles} // [] };
-            }
-
+            @roles = @{ $claims->{roles} // [] };
         }
 
         $c->stash->{user_roles} //= { map { $_ => 1 }  @roles };