[#62351618] Incorporating new setup and broke the register functionality