modify place holder change to Username only
merge with development