more fixes + 2 login pages