issue58: Fixed having to refresh after 1st login