activation and login fixes