diff --git a/account_manager.py b/account_manager.py
index 5b36bfbf8ce2dfcf2c3412982028cd9ff34c24ea..5cecb280077890a545502dc62bde1ec82395d3dd 100755
--- a/account_manager.py
+++ b/account_manager.py
@@ -12,7 +12,7 @@ import rabbit_config as rcfg
 parser = argparse.ArgumentParser(description = "Account management driver script")
 parser.add_argument("username", help="Username that should be locked/unlocked")
 parser.add_argument("state", help="Choose from states (ok,block,certify) to put the user in")
-parser.add_argument("service", nargs='*', help="List one or more services to be blocked")
+parser.add_argument("-s", "--service", nargs='+', default='all', choices=['ssh', 'newjobs', 'all'], help="List one or more services to be blocked (default: %(default)s)")
 parser.add_argument(
     "-a", "--all", help="Block all services")
 parser.add_argument(