Bug 19936: Replace Generate_Userid - Update the occurrences