Account re-activation

Added code to ensure already-activated accounts don't re-activate