Changed current_user check from an '&&' to a '||' check