BuddyPress.org

We have buddypress blog setup and it works fine. I am having little issue with new users activation. When new user joins community, they receive an activation email along with the activation link, so flow works fine here. However, if they click on activation link accidentally second time they reach to activate page where they are asked to enter activation key manually. This confuses all my users.
Can we change flow on this.