Fix handling of username