diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm
index 1cdba41c0ebea989b013d23f68949d674bcf9ebe..c31c61f37372a5e8b9928342c641c7c442ead0e7 100644
--- a/lib/AccountManager/App.pm
+++ b/lib/AccountManager/App.pm
@@ -395,12 +395,9 @@ sub req_select_email {
 sub req_complete_challenge {
     my ($self, %args) = @_;
 
-    my $federation = $self->get_parameter(name => 'federation');
     my $entityid   = $self->get_parameter(name => 'entityid');
     my $email      = $self->get_parameter(name => 'email');
 
-    my $metadata_file = $self->get_metadata_file(federation => $federation);
-
     my $sp = AccountManager::ServiceProvider->new(
         db       => $self->{db},
         entityid => $entityid,
@@ -495,9 +492,8 @@ sub req_complete_challenge {
         entityid  => $entityid,
         token     => $token->secret(),
         challenge_url => sprintf(
-            '%s?action=complete_challenge&federation=%s&entityid=%s&email=%s',
+            '%s?action=complete_challenge&entityid=%s&email=%s',
             $self->{configuration}->{app}->{url},
-            $federation,
             $entityid,
             $email,
         ),
@@ -567,7 +563,6 @@ sub req_complete_challenge {
         template  => 'complete_challenge.tt2.html',
         data     => {
             action     => 'complete_challenge',
-            federation => $federation,
             entityid   => $entityid,
             email      => $email,
         }