Added an option to swap username and full name