Fixed a bug realted with username