added username to user fields