small fixes:
renaming activate method parameter and corresponding parameter in the email activation link
also changed the email link to user id instead of user name