Merge pull request #15 from Chris--S/multiple_users

Multiple users
Merge remote-tracking branch 'upstream/multiple_users' into multiple_users
require the security token for approval, add it into the approval link