Merge pull request #60 from wluo/flock

also populate the user's email on individual signup page if we have it
Merge pull request #61 from wluo/flock

show redundant subscription sign-up warning even if not coming from the corporate purchase page
skipped the sign-up form filter too early