fixed user forwarding2
fixed user forwarding3
fixes tests