Fix association w/user bug

- We need to encode which email we sent a link to in the email
  preferences link so we know what email address to associate the
  (possibly) new trello identity with
Fix forward issues