diff --git a/account_manager.py b/account_manager.py
index a4b701725f12ae4c1449088d8283ac4455cee404..109a516bb9b875a18046a377d674c913975a61bd 100755
--- a/account_manager.py
+++ b/account_manager.py
@@ -14,7 +14,7 @@ parser = argparse.ArgumentParser(description = "Account management driver script
 parser.add_argument(
     "username", help="Username that should be locked/unlocked")
 parser.add_argument(
-    "state", choices=['ok', 'hold', 'certification'], help="Choose from states (ok,hold,certification)")
+    "state", choices=['ok', 'hold', 'certification', 'pre_certification'], help="Choose from states (ok,hold,certification,pre_certification)")
 parser.add_argument(
     "-s", "--service", nargs='+', default='all', choices=['ssh', 'newjobs', 'expiration', 'all'], help="List one or more services to be blocked (default: %(default)s)")
 parser.add_argument(
diff --git a/prod_rmq_agents/acct_mgmt_workflow.py b/prod_rmq_agents/acct_mgmt_workflow.py
index 6d0f6c81d1207d110ba93ddfd051f142a9b56be0..9463aa98a4466e2ced87075cd08dae74b8bc5ff6 100755
--- a/prod_rmq_agents/acct_mgmt_workflow.py
+++ b/prod_rmq_agents/acct_mgmt_workflow.py
@@ -34,7 +34,7 @@ def manage_acct(ch, method, properties, body):
         if op == 'request':
             if state == 'hold' or state == 'certification':
                 msg["action"] = "lock"
-            elif state == 'ok':
+            elif state == 'ok' or state == 'pre_certification':
                 msg["action"] = "unlock"
             else:
                 print("Invalid state provided. Check the help menu.")