Admin customization, empty name fix