Also fix the user handle