added logic for user name.