Refactoring.
Work-a-round CDI: InvalidState while redirecting.