Fix "Undefined index: USER" error from #127
Merge pull request #154 from drbyte/undefined-index-user

Fix "Undefined index: USER" error from #127