change way of getting username