Fixing the users part.