correct the safe username
correct the xml for push