Fixing null user bug