Fixed a bug with the redirect url
Merge branch 'hotfix/redirecturl'