merged 2 login gateway into one application