SDN and Login fix