Added initial Login and Register suport