Fix for https://github.com/TeamMentor/Master/issues/535
The previous change to use Server.Transfer was not working all the time