Fixed Login and Register