Fixed registered user picking type as per config