Closed #160, update Username (label) and error message