Restore some issues with current-user and the gsub