wip - Update SecurityFactory methods and LoginService

Update SecurityFactory methods and LoginService