Reverting not allowing spaces inside username (2.5.x)