Fixing logged in user name issue