Fix "Undefined index: USER" error from #127