Fixes to ensure the double opt in works and the correct actions occur with existing user profiles