[8.x] Only add the username property if it's not empty

[8.x] Only add the username property if it's not empty #121