Add spare login into frames - needs refactoring