Fixed some bugs that allowed to jump back and forth between entering valid senders and recievers.