another current_user fix