Refactor User Account Activation