Fixed name servlet and some username issues