Bug 1861 [QA Followup] - Fix Check_Userid and unit tests