added correct user check, friendly forwarding