fixed @current user problem in staging