Add username in form data only if necessary