Updated to address no user and no user settings, PDF junk is in here too.
Merged to master from Liger