diff --git a/bin/account-manager.pl.in b/bin/account-manager.pl.in
index 67f7fa5580270e9b837180268d6eeb06a99def52..6a63d90747ad5b5800f9f9fad025d1be6489a6c5 100755
--- a/bin/account-manager.pl.in
+++ b/bin/account-manager.pl.in
@@ -181,32 +181,28 @@ sub add_provider {
     ) unless $options{contacts};
 
     ## Check if entry already exists in DB first
-    my $service_provider =
-      IdPAccountManager::Data::ServiceProvider->new(
+    my $provider = IdPAccountManager::Data::ServiceProvider->new(
         db       => $db,
         entityid => $options{sp_entityid}
     );
-    if ($service_provider->load(speculative => 1)) {
+    if ($provider->load(speculative => 1)) {
         printf "Entry for %s already in DB; update it with new data\n",
           $options{sp_entityid};
 
-        $service_provider->contacts($options{contacts});
-        $service_provider->displayname($options{displayname})
-          if ($options{displayname});
+        $provider->contacts($options{contacts});
+        $provider->displayname($options{displayname}) if $options{displayname};
     } else {
-
-        $service_provider = IdPAccountManager::Data::ServiceProvider->new(
+        $provider = IdPAccountManager::Data::ServiceProvider->new(
             db          => $db,
             entityid    => $options{sp_entityid},
             contacts    => $options{contacts},
             displayname => $options{displayname}
         );
         die "failed to create service provider\n"
-            unless $service_provider;
+            unless $provider;
     }
 
-    die "failed to save service provider"
-        unless $service_provider->save();
+    $provider->save() or die "failed to save service provider";
 
     printf "Service Provider created\n";