SONATA-413 - Fixed redirection