Added logic to activate and updated signup