Clean up logic for account activation (still needs a bit more luv)