added helper for activation
changed some redirects