diff --git a/backend/src/bounty/api/accept.rs b/backend/src/bounty/api/accept.rs
index c2d3a98..c9fe76f 100644
--- a/backend/src/bounty/api/accept.rs
+++ b/backend/src/bounty/api/accept.rs
@@ -27,6 +27,7 @@ pub fn accept_impl(
                         updated_at: now
                     };
                     // TODO: Check contributor it's registered and github_issue_id exists on github
+                    // TODO check the issue is not claimed and still open!
                     issue.bounty.accepted_prs.insert(github_pr_id.clone(), pr);
                 }
             }
diff --git a/backend/src/bounty/api/register_issue.rs b/backend/src/bounty/api/register_issue.rs
index b5a9e7a..6e6e9f7 100644
--- a/backend/src/bounty/api/register_issue.rs
+++ b/backend/src/bounty/api/register_issue.rs
@@ -32,6 +32,7 @@ pub fn register_issue_impl(
                     
                 };
                 // TODO: Check contributor it's registered and github_issue_id exists on github
+                // TODO check the issue is still open!
                 bounty_canister
                     .github_issues
                     .insert(github_issue_id.clone(), github_issue);
diff --git a/backend/src/bounty/api/unregister_issue.rs b/backend/src/bounty/api/unregister_issue.rs
index 6cf71e9..cdcfee2 100644
--- a/backend/src/bounty/api/unregister_issue.rs
+++ b/backend/src/bounty/api/unregister_issue.rs
@@ -11,6 +11,7 @@ pub fn unregister_issue_impl(github_issue_id: IssueId) -> UnRegisterIssueReceipt
 
             if issue_exists {
                 // TODO: Check contributor it's registered and github_issue_id exists on github
+                // TODO check the issue is claimed, return error if not!
                 bounty_canister.github_issues.remove(&github_issue_id);
             }
             None