diff --git a/lib/IdPAccountManager/WebRequest.pm b/lib/IdPAccountManager/WebRequest.pm
index bd0495f415e52e85df233326b68e80e4a29ad73b..08677e8e34e99e3816ed929ee3f38b76f0823183 100755
--- a/lib/IdPAccountManager/WebRequest.pm
+++ b/lib/IdPAccountManager/WebRequest.pm
@@ -85,10 +85,20 @@ sub execute {
 
     # initialize output parameters
     $self->{out} = {
-        url_cgi => $ENV{SCRIPT_NAME},
-        env     => \%ENV,
-        actions => \%actions,
-        conf    => $self->{configuration},
+        env => {
+            REMOTE_HOST => $ENV{REMOTE_HOST},
+            REMOTE_ADDR => $ENV{REMOTE_ADDR},
+            SCRIPT_NAME => $ENV{SCRIPT_NAME}
+        },
+        conf => {
+            accounts_validity_period => $self->{configuration}->{accounts_validity_period},
+            app_name                 => $self->{configuration}->{app_name},
+            app_url                  => $self->{configuration}->{app_url},
+            idp_scope                => $self->{configuration}->{idp_scope},
+            idp_displayname          => $self->{configuration}->{idp_displayname},
+            support_email            => $self->{configuration}->{support_email},
+            version                  => $self->{configuration}->{version},
+        }
     };
 
     # process input parameters
@@ -152,13 +162,6 @@ sub respond {
     my ($self) = @_;
     $self->{logger}->log(level => LOG_DEBUG, message => "");
 
-    ## Automatic pass object entries to the output hash
-    foreach my $key (keys %{$self}) {
-
-        $self->{out}{$key} ||= $self->{$key}
-          unless ($key eq 'out');
-    }
-
     ## Parse template
     my $tt2 = Template->new(
         {