Removed Unused Username Field, Added CommonHeader Usage