Login and Register modified