Added Username logic