Added in slight rework of Login service to bring in line with new COM.