Fix to user page crashing when logged in
Merges