One citical bug fix in user creation process due to new requirements
addition.