Updated code so that UsernameToken isnt needed anymore