diff --git a/bin/account-manager-web.pl b/bin/account-manager-web.pl
index 1f695c057aaedfe0fb1ae96073f4886d8d50f8cd..3532f5ef868c65f55bed04b529507383f567aa19 100755
--- a/bin/account-manager-web.pl
+++ b/bin/account-manager-web.pl
@@ -20,12 +20,7 @@ chdir $configuration->{root_manager_dir};
 my $request = new IdPAccountManager::WebRequest(
     configuration => $configuration
 );
-
-if (defined $request) {
-    $request->execute();
-}
-
-$request->respond();
+$request->run();
 
 __END__
 
diff --git a/lib/IdPAccountManager/WebRequest.pm b/lib/IdPAccountManager/WebRequest.pm
index 1adef588b4dc6d6e7c98ca4a99287ac9d680ad75..470e6cec4cfc0b632a291c81ca7655ec53485804 100755
--- a/lib/IdPAccountManager/WebRequest.pm
+++ b/lib/IdPAccountManager/WebRequest.pm
@@ -70,6 +70,12 @@ sub new {
     return $self;
 }
 
+sub run {
+    my ($self) = @_;
+    $self->execute();
+    $self->respond();
+}
+
 ## Execute a web request
 sub execute {
     my ($self) = @_;