Heidi - fixed logged in issue