Fixed login/signup duplication
Fixed display of username