Swapped in support for CURRENT_USER