Bugfix for redirect, and user confict