fix redirect issue and confusion between user and admin