Fix username escaping

Only one space replace was being made, fixed now

Change-Id: Ia939f04f8b3b7b9cc27bb4409c3f0c263b6f7532