Fixing null usernmame