Code Clean up: Standardize the id selectors for register new account scenario