Fixed recursive dependency on logged in user