fixed issues with username