Fix NPE with initial user state