diff --git a/bin/account-manager-client.pl b/bin/account-manager-client.pl
index bd57933e17d1d68299824e8684d78931babb3c31..8d78378345ae4265344f1c0293d0e5dbb31e8723 100755
--- a/bin/account-manager-client.pl
+++ b/bin/account-manager-client.pl
@@ -364,14 +364,14 @@ functions.
 =head1 EXAMPLES
 
     $> account-manager-client.pl add_test_account \
-    --sp_entityid=https://test.federation.renater.fr/test/ressource
-    --account_profile=student1 \
+    --sp_entityid https://test.federation.renater.fr/test/ressource \
+    --account_profile student1
 
 Adds a new test account.
 
     $> account-manager-client.pl list_test_accounts \
-    --sp_entityid=https://test.federation.renater.fr/test/ressource \
-    --account_profile=student1
+    --sp_entityid https://test.federation.renater.fr/test/ressource \
+    --account_profile student1
 
 List all test accounts. Criterias can be added to filter test accounts.
 
@@ -390,8 +390,8 @@ Parses the SAML metadata file, as defined by the
 C<federation_metadata_file_path> configuration parameter.
 
     $> account-manager-client.pl list_authentication_tokens \
-    --sp_entityid=https://test.federation.renater.fr/test/ressource \
-    --token=dhj67sjJ
+    --sp_entityid https://test.federation.renater.fr/test/ressource \
+    --token dhj67sjJ
 
 List all authentication tokens. Criterias can be added to filter tokens.
 
@@ -406,13 +406,13 @@ List all expired authentication tokens.
 Remove all expired authentication tokens from DB.
 
     $> account-manager-client.pl get_authentication_token \
-    --token=dhj67sjJ
+    --token dhj67sjJ
 
 Get informations on a token.
 
     $> account-manager-client.pl add_authentication_token \
-    --email_address=john@my.fqdn \
-    --sp_entityid=https://test.federation.renater.fr/test/ressource
+    --email_address john@my.fqdn \
+    --sp_entityid https://test.federation.renater.fr/test/ressource
 
 Adds a new test account.
 
@@ -421,8 +421,8 @@ Adds a new test account.
 Sends a mail notice to the specified email address.
 
     $> account-manager-client.pl add_service_provider \
-    --sp_entityid=='https://test.federation.renater.fr/test/ressource _
-    --displayname='Test SP' --contacts=email1@dom,email2@dom
+    --sp_entityid https://test.federation.renater.fr/test/ressource \
+    --displayname 'Test SP' --contacts email1@dom,email2@dom
 
 Adds a new Service provider