And now fix logged in folks