CS-3: Change customer number to username