Fixed redirect recycling bug where user keys would be given, tidied up logic by removing unnecessary validation