diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthOpenID.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthOpenID.pm
index 4a60e60d9..b08725efa 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthOpenID.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthOpenID.pm
@@ -124,9 +124,7 @@ sub extractFormInfo {
 
         # If UserDB uses OpenID, add "OpenID Simple Registration Extension"
         # compatible fields
-        if (   $self->{userDB} =~ /^OpenID/
-            or $self->{stack}->[1]->[0]->{m} =~ /^OpenID/ )
-        {
+        if ( $self->get_module('user') eq 'OpenID' ) {
             my ( @r, @o );
             while ( my ( $v, $k ) = each %{ $self->{exportedVars} } ) {
                 if ( $k =~