Fix single user bug