fix problems with @user vs current_user