Add Login and Register support