remove null check rom username