Minor fixes/tweaks
Hopefully fixed this stupid logged in user issue