#961: Open Redirection Vulnerability

It's about time to fix this