Fixed Account activate/deactivate and speeded it