Added keeping flash before redirects